small cleanups, and removed a needless MVMROOT