some cleaning

Change-Id: I0fa86a0a76a295dcad063b84847320efb12cdb08