Useless else if removed
Fixed typo in remove function