406: improving cleanup