Added the possibility to remove tasks