Comment out stuff that breaks it