Removed unneccessayry vector stuff