Mechanical code cleanup (sal-connector-api)