Removing incorrect implementation