Remove even more useless legacy cruft...