PR for code review

deleted this class na po.