Remove old cruft. @plorry may want to review.