Removed unused code and optimized settings
Optimized settings. Again. :)