some Cleanup.

Signed-off-by: voleg <ffrooty@gmail.com>