Swift cleanup