remove iCloud stuff
Added perform and save helpers