Removal of IOS specific dependencies