remove deprecation warnings from templates