Tidy up, remove old constants
Merge pull request #257 from alphagov/remove_old_constants

Remove old constants, make some things private