Remove pretty much all classes stuff, #240