Comment out some unused methods and specs