GUI-466 removing keys and operators we don't need according to sjones4