delete some codes for improvement