Added cleanup feature