Comment out some unused things