Fixed catchup and delete scripts