Removing redundant command variables