Repairing the surface of InAs-based topological heterostructures