DEV: Clean up vector code