Call out platform-specific branches

Remove now duplicated code