remove Toolset and useless extend(s)