Removing cleanup routine