Implement remove and search