Remove DE from template
Update samples