Remove more EnsureInitializeds