Remove some un-needed defs