Added cleanup method.