remove some uesless API, made it more simple