Deleted inappropriate classes
Traveling in universe after load is fine
Merge origin/M7 into M7