Remove unused (testing utility) code