Removed any reference to UDID identifier, other minor fixes