More object initialization cleanup