Domain project cleanup