Commenting out some broken stuff for production