Tools table clean-up