Remove some more useless definitions