Fixed cleanup script