remove dup code & unnessary parm passing