Remove 'domain' package dependency