more cleanup, prep for separating symbolic and generic vertices and lines