Cleanup builds, add prod/dev envs