Got rid of templates
Templates deleted

- need to find out why vector destructor fails