Added cleanup process