Clean up some random test code