Better tool removal from tools menu