comment stuff out to make upgrade work