Minor - Bazaar spike cleanup