Remove use of org_count from server