Got rid of test code in non-test file