removed redundant code
erged Feature1