Updated cleanup script to handle hadoop*