removed more unused files; adjusted templates