Removed command remapping.  Need a different fix.  Too cumbersome.