removing unneeded cleanups