cleaning up legacy cruft