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