cleans up for mvp