tweak and improve os2sd switch, dump unneeded files

Change-Id: I413adde6d7d661ae50012d5f2c74b794fb8a686b