Some mvp cleanup