v486 DefInjected cleanup