Fix for new init cleanup

Change-Id: I8a718b349fa54b9774a5618ef51741758ed95ab9