enhance cleanup procedure