Add working remove() function