remove unnecessary code cause by merging