Cleanup & Some fixes(U8951) Thanks kra1o5

Change-Id: I2a27165196bdd195e21b71befc540d27a3ef7b73