Remove old implementations of Reader/Writer
Comment out tests for old implementations