Clean AbstactService and FOGService, further rewrite needed