Fixed the remove method