ARMORY-235 - Removed all sweep after scan code blocks