Improved stop and remove procedure as well as cancelling jobs.