Removing template stuff