Clean up fetch logic