Remove separate sendId function