Removed unnecessary settings, minor tweaks