templates refactorring connected with tracking - removing uneeded data