Cleaned up build settings and config