removed unnecessary lines
more template aliases