Cleaning up tool add block and reverting toolbar to toolset to avoid name collision