added full removal