Removing old "endpoint" and replacing it to current "process with one consumer" model.