cleaned up and added migrations