put all the cleanup together BEFORE the save for computers - changed action_At