house keeping .. these are not used anymore

Change-Id: I7460cb1fa4a666b18610eeac51a4c639952c97ed
Merge "house keeping .. these are not used anymore"