reverted unnecessary changes to cleanUp() functions