Removed unused code from Service