Refactor - remove redundant methods