Comment out more things that are broken