if we want to remove those Bultins in the future then replace. Moreover if this PR is intended as a cleanup