OrgHandler: unused private methods removed