extended cleanup