clean up some domain stuff so scaffolding works better, upgrade to  2.3.3