simpification, removed extra classes