Using template
Removing unneeded Angular