Reader cleanups