Turns out that it was not Safe Mode that solved my problem. I switched back to CDMA/LTE and my battery life went back to just a few hours. When I switched back to CDMA only my battery life went to more than 24 hours. You change it in Settings -> Mobile Network and then click on 'Network Mode' to change.