Remove small bits of test code