cleanup and prep for p2
6 files changed