Cleanup, fixes for new project boilerplate