Refactor - delete not used getters and methods