Delete entries and updated for newest android studio