project reshuffling
cleanup