Remove some unnecessary statements