Deleting duplicate and incorrect implementation