Minor update and remove old stuffs

Signed-off-by: Tu, Do <tuhdo1710@gmail.com>