Mvp 9 - cleanups