Minor - Remove variable type - refs BT#9041
Allow cut/paste - refs BT#9041