Cleanup, Removed Vector classes in favor of UE versions