removed all notion of services