remove duplicate Templates
templates update
integration refactoring