rm cleaner branch services code.
Merge pull request #889 from Singly/cleaner-other-services

rm cleaner branch services code.