Updated abbreviations to match manuscript

I also removed some more bits of unused code that's been commented out for a
while now.

Signed-off-by: Ted Gibbons <ted.codes@gmail.com>