CleanUP and GCC 4.6

Change-Id: Iba9a9821382febc4ececda3998220751217854ca