Updated content unassociate calls to be based of unit_id or content_id