Tidy up some no-longer-needed cruft.