Rearranged cleanup file