Removing unneeded testing code