cleanup of template
merge
removed needless file