Some cleaning

Change-Id: I06a5f90793465c76920b244dcaa597dc590f1dae