Commented out some unneeded features.