Clean the unnesseceries for MVP