Keep main clean

There was test code intermingled with non-test code...