Removed unneeded reader optimizations