Removing toSet/Map from TS mappings