Cleanup in tools folder