strip down classes and remove additional methods