[MODIFY] fixup unnecessary code