removed template functions from .cpp