Do some cleanup

Signed-off-by: Wu Xudong <tikiet@gmail.com>