Removed more SQL modules
Migration cleanup
Everything compiles, not tested
Added missing file
Tests compile, don't pass