Remove DL's from templates.
merged master