Removing cross domain logic to simplify.