Simplify some stuff. Seems like less complicated commands for scanner work.