Need to fix and test remove()