wip 2/?: cleanup, remove pattern guards