remove services, replace their calls to a call to em
Merge branch 'feature-remove_illdoitlater' into dev