Remove unused methods. Comment out unused constants.