CleanUp all the messed up stuff