Remove useless template
Fix helper. All green again.