cleanup script adjusted