removed unused local variable
removed deprecated dependency of Android Version