Removed redundant data reading