Remove unused/duplicating fetching code