wip: remove cruft