Move sweeper to application controller