Comment out more things probably not needed