master cleanup, ready for sprint 1 integration