Remove now unused sweeper stuff