Fix Patrick's mess

Also deleting my unused template ...