Remove unnecessary classes

reviewer: @tkawachi