two copies of the functions had been created during last merge. removing the redundant code.