removed TODO from service