Merge "Remove outdated transition code"