CLEANUP

Signed-off-by: Kevin Liu <airk908@gmail.com>