Refactor: Unused methods