Remove Bloatware

Change-Id: I7b0e869660ae5205af2deb87a2e0f07a93c8ee85
improve extracting version from file

Change-Id: I1cd53173384521ba2446b7879262a10e0ecdb3b4
Changes

Change-Id: I1e54deb29a3018b841f4c7977462a3866fd02d6c