clean up for init

Change-Id: I712d3e28fd15a27b573db56f607835b06116d1b3