Updated cleanup script