Removing cleanup functions