Removing unused template
Merge remote-tracking branch 'rodms/cleanup'