Removed a pile of spurious old definitions that were a hang-over from the inception of the library