Commented out some stuff that isn't ready for production