shortened library names
removed unneeded template code