Added stop/remove functionality