Refactor: Remove unused methods