Complete migration from System.Reflection usage