[sr-dev] git:master: domain: Boilerplace cleanup