More cleaning up.
Vector-related functions not needed