extend cleanup