Added Removal stuff for new buttons