Some dead code removal and playing with build-level settings.