Removed services replaced by generated code