Removed remaining Apple-isms