Correct cleanup