JJ/HM: Removed old style collectors