Cleanup vector change-over
Switched uint_set generation to std::set