Merge "Refactor: Remove unused branch."