Some clean-ups
Signed-off-by: sxakwq <sxakwq@qq.com>