Remove map from WindowSupport