Cleaning up old test cruft.