Remove legacy cruft