removing the dummy classes

@rima-alali