DS-1005 cleanup of entities controller