Removed unused code and tests and fixed the indentation in a few files.
Merge pull request #70 from mbucknell/PUBSTWO-1021

Removed unused code and tests and fixed the indentation in a few files.