Code clean-up

Thanks Android Studio!
manageData: Add lollipop check to prevent FC