Some cleanup during iOS implementation.