Removed obsolete dependencies from service modules
Renamed method