removed Command and CommandAndKey as they are no longer used.
Updated classes accordingly.