remove some unnecessary lines for issue#1240