cleanup for new project code