Merge in Submodule Remove and Various Fixes