fixed context menu binding and removed code