[TASK] Remove controls from facet map