removed some redundant and obtrusive testing code