Removed a good deal of bad code

Yay Vectors!