Cleaning space and misc stuff

Change-Id: I00cd10e854283e8e76bf1a4d737503389c5746d2