Removing cleanup code