Cleaning up garbage "test code"