Remove extra migrations and update schema