commit deleted all redundant class and fixed some errors