PMO-2218: remove stop functionality