Comment out or remove some unneeded code.