deleing unused class and updating g class
deleing unused class and updating g class