Fixes some more stuff in remove()