Remove unused third argument
Consolidate this code to a common method