Mod: remove unused services
Mod:  fix bugs