Correct cleanup chain