Tidied up unused/old methods after refactoring