Some clean up build settings