remove security concerns from domain model