Make cleanup easier