Clean up some cruft