cleanup on fetch