wip: cleanup, remove pattern guards