More service cleanup.