corebird: clean up template as suggested by @baedert