Remove usage of results from Data class