Fix Swift cleanup