Fix removal of scan method