I have done both but my contacts will not work. I have also have had problems with my battery ever since lollipop. It was just fine before but now it doesn't last 4 hours without needing to be charged. What else can I do to get my phone working properly?