Cleanup and android version authorship