WIP: remove domains from core

Yeah... This is going to take a while.