fixed remove and find methods