Comment out some unused functions