Cleaned up vector logic

Cleaned up vector logic by deleting map