Comment out more stuff and hope it works