Adapt init with common and cleaning

Change-Id: I846697daf8bd71055ba709f29bbda319e2386758