Removed some commented out old settings