remove COMMAND_MAP which is no longer used
Refactor toolbar button creation