Cleanup in prep to start development