Removed useless template crap