Clean useless statements
Revert "Clean useless statements"

This reverts commit 1e2cea106dd1fe090ee2aa86741b3ca0deabcd77.