Cleanup Definitions

I've removed some broken, and some unneeded definitions.