Add basic remove stop functionality