Clean up code, such as removing unused fetching functions
Clean up code, such as removing unused fetching functions