fix urls & remove duplicate function #281

fix urls & remove duplicate function #281