Remove some of the unused definitions