Removed old unused code as part of refactor.