remove some code about final