Cleanup prep for actual development