Clean up some crud from init

Change-Id: I72250407816d5dc3d9db104f58189a0d1cc6a180