cleanup
added Toolbox pluggin pattern