Clean up in DDD requirements