mvp - cleanup