Clean up some cruft.