cleanup for open sourcing
21 files changed