lib context menu cleanup; move WIP