Remove stop handler