Build settings cleanups