Some cleanup after Apple's mess