Battery drain: background activity photos

[davidra]

I don't get what happened when they changed the photos app. Now it doesn't upload, and I do have it set for icloud upload but I always notice that it asks me to connect to wifi to upload photos.....when I'm connected to wifi. Additionally today all of a sudden I burned up 20% of my battery usage on background activity for photos. When I go to turn off upload to photo stream (which I thought didn't exist anymore) it tells my I will delete all Photo Stream pictures from my phone. If I turn off Icloud photo library I get a message saying all photos not fully downloaded will be removed from the phone. Since I use optimized storage, does that mean all pics will be removed? I can't believe they have screwed this up....or am I just missing something simple?