Fix double cleanup (2nd try)