removed extra includes from a few templates