rm cleaner branch services code.

Incremental towards #882.