GlobalVectorInjector readded and cleaned up.