Clean up fetch method