Removing unnecessary settings, cleaning up for deployment