Removed unused variables after we removed the tools