Minor
Update Android
Cleanup