Removed Service code