Make remove/restart functioning