Move requirement of sweepers to better place