minor: fixing aggregation domain cruft
build: cleaning up in the remote branch