Remove some unused codes