Cleanup
Update Android