Unnecessary after refactor