dummy classes removal

dummy classes removal