Remove duplicate folder and latest admin update
