Some cleaning
Linaro 4.7.2