Cleaned duplicate and update android