remove clear some code