Cleanup more legacy cruft...