Implemented delete and createTool fix