Dont pass uncalled commands in map