CleanUp, Name change, Constructor change