Merge "Cleanup ssh users"