fixed some space and import issues coddcy; remove a lib; Signed-off-by: danfengliu <danfengl@vmware.com>