#Bugs fixed on remove