More clean up
more work on the migrations