Proper cleanup
GlobalVectorInjector readded and cleaned up.
FireTableUpdater added and cleaned up.