Bugfix: remove double 'block' templates