Removed much of the data transferred to improve performance