140617 Added cleanup