Remove extra files
Revert to longer but necessary defintions for terms and types.