bundlor template cleanup