Removed unneeded markup from template