Moved methods out the iCloud handling section.