Removing toolset from the code