Cleans up some cruft.