Non 'free' reader implementation. / #SCO-20
Dod clean up / #SCO-23