Remove cmd_map from the core