Mapping fixes for drivers, remove some commands