Added more cleanup to runner