diff --git a/_data/meltano/extractors/tap-cassandra/datarts-tech.yml b/_data/meltano/extractors/tap-cassandra/datarts-tech.yml
index 987d9f3ee..a46166b0c 100644
--- a/_data/meltano/extractors/tap-cassandra/datarts-tech.yml
+++ b/_data/meltano/extractors/tap-cassandra/datarts-tech.yml
@@ -1,9 +1,7 @@
 capabilities:
 - about
-- batch
 - catalog
 - discover
-- schema-flattening
 - state
 - stream-maps
 description: NoSQL Database
@@ -65,7 +63,7 @@ settings:
   name: keyspace
 - description: The local_dc parameter should be the name of the datacenter.
   kind: string
-  label: Local Dc
+  label: Local Datacenter
   name: local_dc
 - description: Should be a total number of attempts to be made before giving up.
   kind: integer
@@ -76,7 +74,7 @@ settings:
   kind: password
   label: Password
   name: password
-- description: The server-side port to open connections to. Defaults to 9042. .
+- description: The server-side port to open connections to. Defaults to 9042..
   kind: integer
   label: Port
   name: port
@@ -91,7 +89,7 @@ settings:
   label: Reconnect Delay
   name: reconnect_delay
   value: 60
-- description: Request timeout used when not overridden in Session. Execute().
+- description: Request timeout used when not overridden in Session.execute().
   kind: integer
   label: Request Timeout
   name: request_timeout
diff --git a/_data/meltano/extractors/tap-gmail/kgpayne.yml b/_data/meltano/extractors/tap-gmail/kgpayne.yml
index 8c04b989a..283ff6f41 100644
--- a/_data/meltano/extractors/tap-gmail/kgpayne.yml
+++ b/_data/meltano/extractors/tap-gmail/kgpayne.yml
@@ -36,7 +36,7 @@ settings:
   value: false
 - description: Only return messages matching the specified query. Supports the same
     query format as the Gmail search box. For example, "from:someuser@example.com
-    rfc822msgid:<somemsgid@example. Com> is:unread". Parameter cannot be used when
+    rfc822msgid:<somemsgid@example.com> is:unread". Parameter cannot be used when
     accessing the api using the gmail. Metadata scope. Https://developers. Google.
     Com/gmail/api/reference/rest/v1/users. Messages/list#query-parameters
   kind: string
diff --git a/_data/meltano/extractors/tap-gmail/meltanolabs.yml b/_data/meltano/extractors/tap-gmail/meltanolabs.yml
index eff333258..04d579362 100644
--- a/_data/meltano/extractors/tap-gmail/meltanolabs.yml
+++ b/_data/meltano/extractors/tap-gmail/meltanolabs.yml
@@ -35,7 +35,7 @@ settings:
   value: false
 - description: Only return messages matching the specified query. Supports the same
     query format as the Gmail search box. For example, "from:someuser@example.com
-    rfc822msgid:<somemsgid@example. Com> is:unread". Parameter cannot be used when
+    rfc822msgid:<somemsgid@example.com> is:unread". Parameter cannot be used when
     accessing the api using the gmail. Metadata scope. Https://developers. Google.
     Com/gmail/api/reference/rest/v1/users. Messages/list#query-parameters
   kind: string
diff --git a/_data/meltano/extractors/tap-google-analytics/connorflyn.yml b/_data/meltano/extractors/tap-google-analytics/connorflyn.yml
deleted file mode 100644
index 783bc2eb4..000000000
--- a/_data/meltano/extractors/tap-google-analytics/connorflyn.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-capabilities:
-- about
-- catalog
-- discover
-- schema-flattening
-- state
-- stream-maps
-description: App and website analytics platform hosted by Google (GA4)
-domain_url: https://developers.google.com/analytics/devguides/reporting/data/v1
-executable: tap-google-analytics
-hidden: true
-keywords:
-- meltano_sdk
-label: Google Analytics (GA4)
-logo_url: /assets/logos/extractors/ga4.png
-maintenance_status: active
-name: tap-ga4
-namespace: tap_ga4
-next_steps: ''
-pip_url: git+https://github.com/connorflyn/tap-google-analytics-v4.git
-quality: bronze
-repo: https://github.com/connorflyn/tap-google-analytics-v4
-settings:
-- description: Google Analytics Client Secrets Dictionary
-  kind: object
-  label: Client Secrets
-  name: client_secrets
-- description: The last record date to sync
-  kind: date_iso8601
-  label: End Date
-  name: end_date
-- description: "'True' to enable schema flattening and automatically expand nested
-    properties."
-  kind: boolean
-  label: Flattening Enabled
-  name: flattening_enabled
-- description: The max depth to flatten schemas.
-  kind: integer
-  label: Flattening Max Depth
-  name: flattening_max_depth
-- description: File Path to Google Analytics Client Secrets
-  kind: password
-  label: Key File Location
-  name: key_file_location
-- description: Google Analytics Access Token
-  kind: password
-  label: OAuth Credentials Access Token
-  name: oauth_credentials.access_token
-- description: Google Analytics Client ID
-  kind: password
-  label: OAuth Credentials Client ID
-  name: oauth_credentials.client_id
-- description: Google Analytics Client Secret
-  kind: password
-  label: OAuth Credentials Client Secret
-  name: oauth_credentials.client_secret
-- description: Google Analytics Refresh Token
-  kind: password
-  label: OAuth Credentials Refresh Token
-  name: oauth_credentials.refresh_token
-- description: Google Analytics Property ID
-  kind: password
-  label: Property ID
-  name: property_id
-- description: Google Analytics Reports Definition
-  kind: string
-  label: Reports
-  name: reports
-- description: The earliest record date to sync
-  kind: date_iso8601
-  label: Start Date
-  name: start_date
-- description: User-defined config values to be used within map expressions.
-  kind: object
-  label: Stream Map Config
-  name: stream_map_config
-- description: Config object for stream maps capability. For more information check
-    out [Stream Maps](https://sdk.meltano.com/en/latest/stream_maps.html).
-  kind: object
-  label: Stream Maps
-  name: stream_maps
-settings_group_validation:
-- - property_id
-  - start_date
-settings_preamble: ''
-usage: ''
-variant: connorflyn
diff --git a/_data/meltano/extractors/tap-google-analytics/sehnem.yml b/_data/meltano/extractors/tap-google-analytics/sehnem.yml
deleted file mode 100644
index e8a3a5fc9..000000000
--- a/_data/meltano/extractors/tap-google-analytics/sehnem.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-capabilities:
-- about
-- catalog
-- discover
-- schema-flattening
-- state
-- stream-maps
-description: App and website analytics platform hosted by Google (GA4)
-domain_url: https://developers.google.com/analytics/devguides/reporting/data/v1
-executable: tap-google-analytics
-hidden: true
-keywords:
-- meltano_sdk
-label: Google Analytics (GA4)
-logo_url: /assets/logos/extractors/ga4.png
-maintenance_status: active
-name: tap-ga4
-namespace: tap_ga4
-next_steps: ''
-pip_url: git+https://github.com/sehnem/tap-google-analytics.git
-quality: silver
-repo: https://github.com/sehnem/tap-google-analytics
-settings:
-- description: Google Analytics Access Token
-  kind: password
-  label: Access Token
-  name: access_token
-- description: Google Analytics Client ID
-  kind: password
-  label: Client ID
-  name: client_id
-- description: Google Analytics Client Secret
-  kind: password
-  label: Client Secret
-  name: client_secret
-- description: The last record date to sync
-  kind: date_iso8601
-  label: End Date
-  name: end_date
-- description: "'True' to enable schema flattening and automatically expand nested
-    properties."
-  kind: boolean
-  label: Flattening Enabled
-  name: flattening_enabled
-- description: The max depth to flatten schemas.
-  kind: integer
-  label: Flattening Max Depth
-  name: flattening_max_depth
-- description: Google Analytics Property ID
-  kind: password
-  label: Property ID
-  name: property_id
-- description: Google Analytics Refresh Token
-  kind: password
-  label: Refresh Token
-  name: refresh_token
-- description: Google Analytics Reports Definition
-  kind: string
-  label: Reports
-  name: reports
-- description: The earliest record date to sync
-  kind: date_iso8601
-  label: Start Date
-  name: start_date
-- description: User-defined config values to be used within map expressions.
-  kind: object
-  label: Stream Map Config
-  name: stream_map_config
-- description: Config object for stream maps capability. For more information check
-    out [Stream Maps](https://sdk.meltano.com/en/latest/stream_maps.html).
-  kind: object
-  label: Stream Maps
-  name: stream_maps
-settings_group_validation:
-- - client_id
-  - client_secret
-  - property_id
-  - refresh_token
-  - start_date
-settings_preamble: ''
-usage: ''
-variant: sehnem
diff --git a/_data/meltano/extractors/tap-gorgias/brooklyn-data.yml b/_data/meltano/extractors/tap-gorgias/brooklyn-data.yml
index 7d5a10398..33393583d 100644
--- a/_data/meltano/extractors/tap-gorgias/brooklyn-data.yml
+++ b/_data/meltano/extractors/tap-gorgias/brooklyn-data.yml
@@ -54,7 +54,7 @@ settings:
   kind: object
   label: Stream Maps
   name: stream_maps
-- description: Subdomain (<subdomain>. Gorgias. Com)
+- description: Subdomain (<subdomain>.gorgias.com)
   kind: string
   label: Subdomain
   name: subdomain
diff --git a/_data/meltano/extractors/tap-hubspot/spacecowboy.yml b/_data/meltano/extractors/tap-hubspot/spacecowboy.yml
index f4e2051fd..a560d7d94 100644
--- a/_data/meltano/extractors/tap-hubspot/spacecowboy.yml
+++ b/_data/meltano/extractors/tap-hubspot/spacecowboy.yml
@@ -53,7 +53,7 @@ settings:
   name: flattening_max_depth
 - description: HubSpot private app token
   kind: password
-  label: Hapikey
+  label: HubSpot API Key
   name: hapikey
 - description: Set to True to avoid using the search API - implies full table replication
   kind: boolean
diff --git a/_data/meltano/extractors/tap-jira/meltanolabs.yml b/_data/meltano/extractors/tap-jira/meltanolabs.yml
index 1ec16424b..133e1c170 100644
--- a/_data/meltano/extractors/tap-jira/meltanolabs.yml
+++ b/_data/meltano/extractors/tap-jira/meltanolabs.yml
@@ -21,10 +21,26 @@ pip_url: git+https://github.com/MeltanoLabs/tap-jira.git
 quality: silver
 repo: https://github.com/MeltanoLabs/tap-jira
 settings:
-- description: ''
+- description: The authentication type to use.
+  label: Auth Flow
+  name: auth.flow
+  options:
+  - label: OAuth
+    value: oauth
+  - label: Password
+    value: password
+- description: The Jira API access token if using OAuth auth flow.
+  kind: password
+  label: Auth Access Token
+  name: auth.access_token
+- description: The Jira username if using the user/pass auth flow.
   kind: string
-  label: Auth
-  name: auth
+  label: Auth Username
+  name: auth.username
+- description: The Jira password if using the user/pass auth flow.
+  kind: password
+  label: Auth Password
+  name: auth.password
 - description: Compression format to use for batch files.
   kind: options
   label: Batch Config Encoding Compression
diff --git a/_data/meltano/extractors/tap-klaviyo/meltanolabs.yml b/_data/meltano/extractors/tap-klaviyo/meltanolabs.yml
index 1f34b429b..d1bfd9a76 100644
--- a/_data/meltano/extractors/tap-klaviyo/meltanolabs.yml
+++ b/_data/meltano/extractors/tap-klaviyo/meltanolabs.yml
@@ -34,7 +34,7 @@ settings:
   kind: integer
   label: Flattening Max Depth
   name: flattening_max_depth
-- description: Klaviyo API endpoint revision. Https://developers. Klaviyo. Com/en/docs/api_versioning_and_deprecation_policy#versioning
+- description: Klaviyo API endpoint revision.https://developers.klaviyo.com/en/docs/api_versioning_and_deprecation_policy#versioning
   kind: string
   label: Revision
   name: revision
diff --git a/_data/meltano/extractors/tap-mailchimp/acarter24.yml b/_data/meltano/extractors/tap-mailchimp/acarter24.yml
index dfd83ff62..9d761ccbf 100644
--- a/_data/meltano/extractors/tap-mailchimp/acarter24.yml
+++ b/_data/meltano/extractors/tap-mailchimp/acarter24.yml
@@ -27,7 +27,7 @@ settings:
   name: api_key
 - description: Your Mailchimp DC
   kind: string
-  label: Dc
+  label: Data Center
   name: dc
 - description: "'True' to enable schema flattening and automatically expand nested
     properties."
diff --git a/_data/meltano/extractors/tap-rest-api-msdk/widen.yml b/_data/meltano/extractors/tap-rest-api-msdk/widen.yml
index fa4e8e9b0..e3fedff3e 100644
--- a/_data/meltano/extractors/tap-rest-api-msdk/widen.yml
+++ b/_data/meltano/extractors/tap-rest-api-msdk/widen.yml
@@ -241,7 +241,7 @@ settings:
     tap will dynamically update the token with either the `start_date`or the last
     bookmark / state value. A simple template Example for FHIR API's: gt$last_run_date.
     A more complex example against an Opensearch API, {\"bool\": {\"filter\": [{\"\
-    range\": { \"meta.lastUpdated\": { \"gt\": \"$last_run_date\" }}}] }} .Note: Any
+    range\": { \"meta.lastUpdated\": { \"gt\": \"$last_run_date\" }}}] }}. Note: Any
     required double quotes in the query template must be escaped."
   kind: string
   label: Source Search Query
diff --git a/_data/meltano/extractors/tap-saasoptics/datarts-tech.yml b/_data/meltano/extractors/tap-saasoptics/datarts-tech.yml
index 5ad836c2d..5bebd3628 100644
--- a/_data/meltano/extractors/tap-saasoptics/datarts-tech.yml
+++ b/_data/meltano/extractors/tap-saasoptics/datarts-tech.yml
@@ -85,7 +85,7 @@ settings:
   kind: object
   label: Stream Maps
   name: stream_maps
-- description: Tap-saasoptics <api_user_email@your_company. Com>.
+- description: tap-saasoptics <api_user_email@your_company.com>.
   kind: string
   label: User Agent
   name: user_agent
diff --git a/_data/meltano/extractors/tap-salesforce/hotgluexyz.yml b/_data/meltano/extractors/tap-salesforce/hotgluexyz.yml
deleted file mode 100644
index a84c68894..000000000
--- a/_data/meltano/extractors/tap-salesforce/hotgluexyz.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-capabilities:
-- about
-- catalog
-- discover
-- schema-flattening
-- state
-- stream-maps
-description: Cloud-based commerce solution
-domain_url: https://www.salesforce.com/products/commerce-cloud/overview/
-executable: tap-salesforce-commerce
-keywords:
-- meltano_sdk
-label: Salesforce Commerce
-logo_url: /assets/logos/extractors/salesforce-commerce.png
-maintenance_status: active
-name: tap-salesforce-commerce
-namespace: tap_salesforce_commerce
-next_steps: ''
-pip_url: git+https://gitlab.com/hotglue/tap-salesforce-commerce.git
-quality: gold
-repo: https://gitlab.com/hotglue/tap-salesforce-commerce
-settings:
-- description: Your Salesforce Client ID.
-  kind: password
-  label: Client ID
-  name: client_id
-- description: Your Salesforce Client Secret.
-  kind: password
-  label: Client Secret
-  name: client_secret
-- description: "'True' to enable schema flattening and automatically expand nested
-    properties."
-  kind: boolean
-  label: Flattening Enabled
-  name: flattening_enabled
-- description: The max depth to flatten schemas.
-  kind: integer
-  label: Flattening Max Depth
-  name: flattening_max_depth
-- description: Your Salesforce Site ID.
-  kind: password
-  label: Site ID
-  name: site_id
-- description: "Determines how much historical data will be extracted. Please be aware\n
-    that the larger the time period and amount of data, the longer the initial extraction\n
-    can be expected to take."
-  kind: date_iso8601
-  label: Start Date
-  name: start_date
-- description: User-defined config values to be used within map expressions.
-  kind: object
-  label: Stream Map Config
-  name: stream_map_config
-- description: Config object for stream maps capability.
-  kind: object
-  label: Stream Maps
-  name: stream_maps
-settings_group_validation:
-- - client_id
-  - client_secret
-  - site_id
-settings_preamble: ''
-usage: ''
-variant: hotgluexyz
diff --git a/_data/meltano/extractors/tap-totango/edsoncezar16.yml b/_data/meltano/extractors/tap-totango/edsoncezar16.yml
index 8a8afc9e0..a4233424d 100644
--- a/_data/meltano/extractors/tap-totango/edsoncezar16.yml
+++ b/_data/meltano/extractors/tap-totango/edsoncezar16.yml
@@ -43,7 +43,7 @@ settings:
     be defined using the count parameter (and limited to 1000). Tip: To page through
     results, ask for 1000 records (count: 1000). If you receive 1000 records, assume
     there’s more, in which case you want to pull the next 1000 records (offset: 1000…then
-    2000…etc. ). Repeat paging until the number of records returned is less than 1000.'
+    2000…etc.). Repeat paging until the number of records returned is less than 1000.'
   kind: integer
   label: Accounts Offset
   name: accounts_offset
@@ -75,9 +75,9 @@ settings:
   label: API URL
   name: api_url
   options:
-  - label: Https://API Totango Com
+  - label: https://api.totango.com
     value: https://api.totango.com
-  - label: 'Https://API Eu1 Totango Com '
+  - label: 'https://api-eu1.totango.com '
     value: 'https://api-eu1.totango.com '
   value: https://api.totango.com
 - description: The token to authenticate against the API service
diff --git a/_data/meltano/extractors/tap-tradera/kgpayne.yml b/_data/meltano/extractors/tap-tradera/kgpayne.yml
index 72f368bb2..311c57993 100644
--- a/_data/meltano/extractors/tap-tradera/kgpayne.yml
+++ b/_data/meltano/extractors/tap-tradera/kgpayne.yml
@@ -19,11 +19,11 @@ pip_url: git+https://github.com/kgpayne/tap-tradera.git
 quality: silver
 repo: https://github.com/kgpayne/tap-tradera
 settings:
-- description: The Tradera. Com developer app ID
+- description: The Tradera.com developer app ID
   kind: password
   label: App ID
   name: app_id
-- description: The Tradera. Com developer app key
+- description: The Tradera.com developer app key
   kind: password
   label: App Key
   name: app_key
diff --git a/_data/meltano/loaders/target-s3/jkausti.yml b/_data/meltano/loaders/target-s3/jkausti.yml
deleted file mode 100644
index 509466ed3..000000000
--- a/_data/meltano/loaders/target-s3/jkausti.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-capabilities:
-- about
-- schema-flattening
-- stream-maps
-description: AWS S3 - Apache Parquet File Format
-domain_url: https://aws.amazon.com/s3/
-executable: target-s3
-keywords:
-- meltano_sdk
-label: S3 Parquet
-logo_url: /assets/logos/loaders/s3-parquet.png
-maintenance_status: active
-name: target-s3-parquet
-namespace: target_s3_parquet
-next_steps: ''
-pip_url: git+https://github.com/jkausti/target-s3.git
-quality: gold
-repo: https://github.com/jkausti/target-s3
-settings:
-- description: AWS Access Key ID used to authenticate programmatically to S3.
-  kind: password
-  label: AWS Access Key ID
-  name: AWS_ACCESS_KEY_ID
-- description: AWS Secret Access Key used to authenticate programmatically to S3.
-  kind: password
-  label: AWS Secret Access Key
-  name: AWS_SECRET_ACCESS_KEY
-- description: Specfies the region in which your S3 bucket exists.
-  kind: string
-  label: AWS Region
-  name: aws_region
-- description: Specifies the filetype to store the data as. Only parquet supported
-    atm. *required*
-  kind: string
-  label: Filetype
-  name: filetype
-  value: parquet
-- description: "'True' to enable schema flattening and automatically expand nested
-    properties."
-  kind: boolean
-  label: Flattening Enabled
-  name: flattening_enabled
-- description: The max depth to flatten schemas.
-  kind: integer
-  label: Flattening Max Depth
-  name: flattening_max_depth
-- description: "Determines the folder-structure. Alternatives are: 'simple', 'date_hierarchy'
-    and 'both'."
-  kind: string
-  label: Folder Structure
-  name: folder_structure
-  value: simple
-- description: The path to where the data should be stored. *required*
-  kind: string
-  label: Path
-  name: path
-- description: User-defined config values to be used within map expressions.
-  kind: object
-  label: Stream Map Config
-  name: stream_map_config
-- description: Config object for stream maps capability. For more information check
-    out [Stream Maps](https://sdk.meltano.com/en/latest/stream_maps.html).
-  kind: object
-  label: Stream Maps
-  name: stream_maps
-settings_group_validation:
-- - filetype
-  - folder_structure
-  - path
-settings_preamble: ''
-usage: ''
-variant: jkausti
diff --git a/_data/meltano/loaders/target-timeplus/timeplus.yml b/_data/meltano/loaders/target-timeplus/timeplus.yml
index 3027d2a36..f9fb8fcbd 100644
--- a/_data/meltano/loaders/target-timeplus/timeplus.yml
+++ b/_data/meltano/loaders/target-timeplus/timeplus.yml
@@ -19,7 +19,7 @@ repo: https://github.com/timeplus-io/target-timeplus
 settings:
 - description: Personal API key
   kind: password
-  label: APIkey
+  label: API Key
   name: apikey
 - description: Timeplus workspace endpoint
   kind: string