diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5df25db6f..131878749 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -93,11 +93,9 @@
   </ItemGroup>
 
   <!-- Add MSBuild.Community.Tasks to use the TemplateFile Task-->
-  <!-- TODO find a solution for token replacement
   <ItemGroup>
     <PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true" DevelopmentDependency="true" />
   </ItemGroup>
-  -->
 
   <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="$(MSBuildProjectName.StartsWith('Greenshot.Plugin.'))">
     <Exec Command="
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 66e1b9c90..f2ce406a1 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -4,12 +4,10 @@
       <MSBuildCommunityTasksPath>$(PkgMSBuildTasks)\tools\</MSBuildCommunityTasksPath>
   </PropertyGroup>
   
-  <!-- TODO find a solution for token replacement
   <Import Project="$(MSBuildCommunityTasksPath)MSBuild.Community.Tasks.Targets" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')"/>
 
   <Target Name="ProcessTemplates" BeforeTargets="PrepareForBuild" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')">
     <Message Text="Processing: $(ProjectDir)$(ProjectName).Credentials.template" Importance="high"/> 
     <TemplateFile Template="$(ProjectDir)$(ProjectName).Credentials.template" OutputFilename="$(ProjectDir)$(ProjectName).Credentials.cs" Tokens="@(Tokens)" />
   </Target>
-  -->
 </Project>
\ No newline at end of file