Removed calls to services modules

Main code rev. 1941