Clear more code

Signed-off-by: Yen-Chin Lee <coldnew.tw@gmail.com>