Added CleanUp

Still Errors