rearrange, cleanup unused code

Change-Id: Ibbe7b4b0aeb18ad330cfe133afa19415780d584f
mv NO_IGNORE_BOOT_MODE to MFG_MODE

Change-Id: I7c20528526890e1be0a37c119b53e30a770dace2