140616-iss001: modify cleanup