Reactive domain cleanup.
WIP cleanup (build currently broken)