[#84]Remove unused fields and methods