Removed old code from service