Removed more testing code