diff --git a/config/secrets.yml b/config/secrets.yml
index b69106b033..0fd0b2c38d 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -10,13 +10,11 @@
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
 
-test:
-  database_test_url: <%= ENV['DATABASE_TEST_URL'] %>
+shared:
   devise_pepper: <%= ENV['DEVISE_PEPPER'] %>
   devise_secret_key: <%= ENV['DEVISE_SECRET_KEY'] %>
   dragonfly_secret: <%= ENV['DRAGONFLY_SECRET'] %>
   google_analytics_token: <%= ENV['GOOGLE_ANALYTICS_TOKEN'] %>
-  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] || Socket.gethostname %>
   mailer_from: <%= ENV['MAILER_FROM'] %>
   mailer_to: <%= ENV['MAILER_TO'] %>
   orcid_client_id: <%= ENV['ORCID_CLIENT_ID'] %>
@@ -42,203 +40,67 @@ test:
   cilogon_client_id: <%= ENV["CILOGON_CLIENT_ID"]%>
   cilogon_secret_key: <%= ENV["CILOGON_SECRET_KEY"]%>
 
+test:
+  database_test_url: <%= ENV['DATABASE_TEST_URL'] %>
+  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] || Socket.gethostname %>
+
 development:
   database_url: <%= ENV['DATABASE_URL'] %>
-  devise_pepper: <%= ENV['DEVISE_PEPPER'] %>
-  devise_secret_key: <%= ENV['DEVISE_SECRET_KEY'] %>
-  dragonfly_secret: <%= ENV['DRAGONFLY_SECRET'] %>
-  google_analytics_token: <%= ENV['GOOGLE_ANALYTICS_TOKEN'] %>
   mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] || Socket.gethostname %>
-  mailer_from: <%= ENV['MAILER_FROM'] %>
-  mailer_to: <%= ENV['MAILER_TO'] %>
   omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
-  orcid_client_id: <%= ENV['ORCID_CLIENT_ID'] %>
-  orcid_client_member: <%= ENV['ORCID_CLIENT_MEMBER'] %>
-  orcid_client_secret: <%= ENV['ORCID_CLIENT_SECRET'] %>
-  recaptcha_secret_key: <%= ENV['RECAPTCHA_SECRET_KEY'] %>
-  recaptcha_site_key: <%= ENV['RECAPTCHA_SITE_KEY'] %>
-  rollbar_access_token: <%= ENV['ROLLBAR_ACCESS_TOKEN'] %>
-  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
-  translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
-  wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
-  wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
-  super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
-  test_password: <%= ENV["TEST_PASSWORD"] %>
-  user_password: <%= ENV["USER_PASSWORD"] %>
-  english_admin_password: <%= ENV["ENGLISH_ADMIN_PASSWORD"] %>
-  english_org_id: <%= ENV["ENGLISH_ORG_ID"] %>
-  french_admin_password: <%= ENV["FRENCH_ADMIN_PASSWORD"] %>
-  french_org_id: <%= ENV["FRENCH_ORG_ID"] %>
-  funder_org_id: <%= ENV["FUNDER_ORG_ID"] %>
-  on_sandbox: <%= ENV["ON_SANDBOX"] %>
-  cilogon_client_id: <%= ENV["CILOGON_CLIENT_ID"]%>
-  cilogon_secret_key: <%= ENV["CILOGON_SECRET_KEY"]%>
 
 staging:
   database_url: <%= ENV['DATABASE_URL'] %>
-  devise_pepper: <%= ENV['DEVISE_PEPPER'] %>
-  devise_secret_key: <%= ENV['DEVISE_SECRET_KEY'] %>
   dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
-  dragonfly_secret: <%= ENV['DRAGONFLY_SECRET'] %>
-  google_analytics_token: <%= ENV['GOOGLE_ANALYTICS_TOKEN'] %>
   http_proxy: <%= ENV['HTTP_PROXY'] %>
   http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
   mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
-  mailer_from: <%= ENV['MAILER_FROM'] %>
-  mailer_to: <%= ENV['MAILER_TO'] %>
   omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
-  orcid_client_id: <%= ENV['ORCID_CLIENT_ID'] %>
-  orcid_client_member: <%= ENV['ORCID_CLIENT_MEMBER'] %>
-  orcid_client_secret: <%= ENV['ORCID_CLIENT_SECRET'] %>
-  recaptcha_secret_key: <%= ENV['RECAPTCHA_SECRET_KEY'] %>
-  recaptcha_site_key: <%= ENV['RECAPTCHA_SITE_KEY'] %>
-  rollbar_access_token: <%= ENV['ROLLBAR_ACCESS_TOKEN'] %>
-  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
   smtp_address: <%= ENV['SMTP_ADDRESS'] %>
   smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
   smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
   smtp_password: <%= ENV['SMTP_PASSWORD'] %>
   smtp_port: <%= ENV['SMTP_PORT'] %>
   smtp_user_name: <%= ENV['SMTP_USER_NAME'] %>
-  translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
-  wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
-  wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
-  super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
-  test_password: <%= ENV["TEST_PASSWORD"] %>
-  user_password: <%= ENV["USER_PASSWORD"] %>
-  english_admin_password: <%= ENV["ENGLISH_ADMIN_PASSWORD"] %>
-  english_org_id: <%= ENV["ENGLISH_ORG_ID"] %>
-  french_admin_password: <%= ENV["FRENCH_ADMIN_PASSWORD"] %>
-  french_org_id: <%= ENV["FRENCH_ORG_ID"] %>
-  funder_org_id: <%= ENV["FUNDER_ORG_ID"] %>
-  on_sandbox: <%= ENV["ON_SANDBOX"] %>
-  cilogon_client_id: <%= ENV["CILOGON_CLIENT_ID"]%>
-  cilogon_secret_key: <%= ENV["CILOGON_SECRET_KEY"]%>
 
 uat:
-  database_url: <%= ENV['DATABASE_URL'] %>
-  devise_pepper: <%= ENV['DEVISE_PEPPER'] %>
-  devise_secret_key: <%= ENV['DEVISE_SECRET_KEY'] %>
+  database_url: <%= ENV['DATABASE_URL'] %>  
   dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
-  dragonfly_secret: <%= ENV['DRAGONFLY_SECRET'] %>
-  google_analytics_token: <%= ENV['GOOGLE_ANALYTICS_TOKEN'] %>
   http_proxy: <%= ENV['HTTP_PROXY'] %>
   http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
   mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
-  mailer_from: <%= ENV['MAILER_FROM'] %>
-  mailer_to: <%= ENV['MAILER_TO'] %>
   omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
-  orcid_client_id: <%= ENV['ORCID_CLIENT_ID'] %>
-  orcid_client_member: <%= ENV['ORCID_CLIENT_MEMBER'] %>
-  orcid_client_secret: <%= ENV['ORCID_CLIENT_SECRET'] %>
-  recaptcha_secret_key: <%= ENV['RECAPTCHA_SECRET_KEY'] %>
-  recaptcha_site_key: <%= ENV['RECAPTCHA_SITE_KEY'] %>
-  rollbar_access_token: <%= ENV['ROLLBAR_ACCESS_TOKEN'] %>
-  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
   smtp_address: <%= ENV['SMTP_ADDRESS'] %>
   smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
   smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
   smtp_password: <%= ENV['SMTP_PASSWORD'] %>
   smtp_port: <%= ENV['SMTP_PORT'] %>
   smtp_user_name: <%= ENV['SMTP_USER_NAME'] %>
-  translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
-  wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
-  wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
-  super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
-  test_password: <%= ENV["TEST_PASSWORD"] %>
-  user_password: <%= ENV["USER_PASSWORD"] %>
-  english_admin_password: <%= ENV["ENGLISH_ADMIN_PASSWORD"] %>
-  english_org_id: <%= ENV["ENGLISH_ORG_ID"] %>
-  french_admin_password: <%= ENV["FRENCH_ADMIN_PASSWORD"] %>
-  french_org_id: <%= ENV["FRENCH_ORG_ID"] %>
-  funder_org_id: <%= ENV["FUNDER_ORG_ID"] %>
-  on_sandbox: <%= ENV["ON_SANDBOX"] %>
-  cilogon_client_id: <%= ENV["CILOGON_CLIENT_ID"]%>
-  cilogon_secret_key: <%= ENV["CILOGON_SECRET_KEY"]%>
 
 sandbox:
-  database_url: <%= ENV['DATABASE_URL'] %>
-  devise_pepper: <%= ENV['DEVISE_PEPPER'] %>
-  devise_secret_key: <%= ENV['DEVISE_SECRET_KEY'] %>
+  database_url: <%= ENV['DATABASE_URL'] %>  
   dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
-  dragonfly_secret: <%= ENV['DRAGONFLY_SECRET'] %>
-  google_analytics_token: <%= ENV['GOOGLE_ANALYTICS_TOKEN'] %>
   http_proxy: <%= ENV['HTTP_PROXY'] %>
   http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
   mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
-  mailer_from: <%= ENV['MAILER_FROM'] %>
-  mailer_to: <%= ENV['MAILER_TO'] %>
   omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
-  orcid_client_id: <%= ENV['ORCID_CLIENT_ID'] %>
-  orcid_client_member: <%= ENV['ORCID_CLIENT_MEMBER'] %>
-  orcid_client_secret: <%= ENV['ORCID_CLIENT_SECRET'] %>
-  recaptcha_secret_key: <%= ENV['RECAPTCHA_SECRET_KEY'] %>
-  recaptcha_site_key: <%= ENV['RECAPTCHA_SITE_KEY'] %>
-  rollbar_access_token: <%= ENV['ROLLBAR_ACCESS_TOKEN'] %>
-  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
   smtp_address: <%= ENV['SMTP_ADDRESS'] %>
   smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
   smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
   smtp_password: <%= ENV['SMTP_PASSWORD'] %>
   smtp_port: <%= ENV['SMTP_PORT'] %>
-  smtp_user_name: <%= ENV['SMTP_USER_NAME'] %>
-  translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
-  wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
-  wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
-  super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
-  test_password: <%= ENV["TEST_PASSWORD"] %>
-  user_password: <%= ENV["USER_PASSWORD"] %>
-  english_admin_password: <%= ENV["ENGLISH_ADMIN_PASSWORD"] %>
-  english_org_id: <%= ENV["ENGLISH_ORG_ID"] %>
-  french_admin_password: <%= ENV["FRENCH_ADMIN_PASSWORD"] %>
-  french_org_id: <%= ENV["FRENCH_ORG_ID"] %>
-  funder_org_id: <%= ENV["FUNDER_ORG_ID"] %>
-  on_sandbox: <%= ENV["ON_SANDBOX"] %>
-  cilogon_client_id: <%= ENV["CILOGON_CLIENT_ID"]%>
-  cilogon_secret_key: <%= ENV["CILOGON_SECRET_KEY"]%>
+  smtp_user_name: <%= ENV['SMTP_USER_NAME'] %> 
 
 production:
   database_url: <%= ENV['DATABASE_URL'] %>
-  devise_pepper: <%= ENV['DEVISE_PEPPER'] %>
-  devise_secret_key: <%= ENV['DEVISE_SECRET_KEY'] %>
   dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
-  dragonfly_secret: <%= ENV['DRAGONFLY_SECRET'] %>
-  google_analytics_token: <%= ENV['GOOGLE_ANALYTICS_TOKEN'] %>
   http_proxy: <%= ENV['HTTP_PROXY'] %>
   http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
   mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
-  mailer_from: <%= ENV['MAILER_FROM'] %>
-  mailer_to: <%= ENV['MAILER_TO'] %>
   omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
-  orcid_client_id: <%= ENV['ORCID_CLIENT_ID'] %>
-  orcid_client_member: <%= ENV['ORCID_CLIENT_MEMBER'] %>
-  orcid_client_secret: <%= ENV['ORCID_CLIENT_SECRET'] %>
-  recaptcha_secret_key: <%= ENV['RECAPTCHA_SECRET_KEY'] %>
-  recaptcha_site_key: <%= ENV['RECAPTCHA_SITE_KEY'] %>
-  rollbar_access_token: <%= ENV['ROLLBAR_ACCESS_TOKEN'] %>
-  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
   smtp_address: <%= ENV['SMTP_ADDRESS'] %>
   smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
   smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
   smtp_password: <%= ENV['SMTP_PASSWORD'] %>
   smtp_port: <%= ENV['SMTP_PORT'] %>
   smtp_user_name: <%= ENV['SMTP_USER_NAME'] %>
-  translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
-  wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
-  wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
-  super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
-  test_password: <%= ENV["TEST_PASSWORD"] %>
-  user_password: <%= ENV["USER_PASSWORD"] %>
-  english_admin_password: <%= ENV["ENGLISH_ADMIN_PASSWORD"] %>
-  english_org_id: <%= ENV["ENGLISH_ORG_ID"] %>
-  french_admin_password: <%= ENV["FRENCH_ADMIN_PASSWORD"] %>
-  french_org_id: <%= ENV["FRENCH_ORG_ID"] %>
-  funder_org_id: <%= ENV["FUNDER_ORG_ID"] %>
-  on_sandbox: <%= ENV["ON_SANDBOX"] %>
-  cilogon_client_id: <%= ENV["CILOGON_CLIENT_ID"]%>
-  cilogon_secret_key: <%= ENV["CILOGON_SECRET_KEY"]%>
\ No newline at end of file