Remove redundant class
Remove TODO and redundant class