tweak and improve os2sd switch, dump unneeded files

Change-Id: Ie5e7727075667f4f78da569ea2f44bc06204c3d8