Remove unused code that was used for byOrg reporting