Further cleanup

Signed-off-by: 2013gang <2013gangli@gmail.com>