Domain, removed legacy code