removed classes, a little bit of testing