remove Reader
implement part of state machine for class setup parsing