Cleaning up old test code.