working on the cleanup script