Comment out some unused stuff