Removed some unused settings and variables