remove complexity and duplication from toolbox.