init clean-up

Change-Id: I3c5729ba7f3653ca577356995ad476f6783a31ac