Remove Duplicate implementation