removed legacy cruft