Removed unneeded template stuff