some file fixes, removed unused template