8.1 SDK - remove scanner code