More submodule tomfoolery and cleanup