* remove dead code
* add more service tests