Refactor AutoTarget scan and GPS interaction

VS wants me to remove these lines. Do we need them?