Remove some useless code