Removed some redundant methods and constants

These ended up no longer being required after the recent candidate layer
refactoring work