Some cleanup of various IS service.

[Review issue 7462001]