added better special handling cleaning support