Removed dead code and cached readers etc.