cleanup simulator port work