Clean up

24 tools