diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index ad50a8856..deaaf8885 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -18,7 +18,6 @@
         <module>web</module>
         <module>data</module>
         <module>logging</module>
-        <module>queryengine</module>
         <module>elastic</module>
     </modules>
 
diff --git a/dmp-backend/web/src/main/resources/application-devel.properties b/dmp-backend/web/src/main/resources/application-devel.properties
index 8d5622159..4826cfea8 100644
--- a/dmp-backend/web/src/main/resources/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/application-devel.properties
@@ -1,9 +1,9 @@
 dmp.domain = http://localhost:4200
 
 ####################PERSISTENCE OVERRIDES CONFIGURATIONS##########
-database.url=jdbc:postgresql://dbserver02.local.cite.gr:5432/dmptool
-database.username=dmtadm
-database.password=t00L4DM@18!
+database.url=
+database.username=
+database.password=
 ####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS##########
 elasticsearch.host = localhost
 elasticsearch.port = 9200
@@ -26,9 +26,9 @@ twitter.login.redirect_uri=http://127.0.0.1:4200/login/twitter
 linkedin.login.redirect_uri=http://localhost:4200/login/linkedin
 
 #############FACEBOOK LOGIN CONFIGURATIONS#########
-facebook.login.clientId=613977555670785
-facebook.login.clientSecret=b656eb30077454dea7b3cfd03b6e4310
-facebook.login.namespace=opendmp
+facebook.login.clientId=
+facebook.login.clientSecret=
+facebook.login.namespace=
 
 #############B2 ACCESS CONFIGURATIONS#########
 b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo
diff --git a/dmp-backend/web/src/main/resources/application-production.properties b/dmp-backend/web/src/main/resources/application-production.properties
index 201e6ca13..69c6f46e0 100644
--- a/dmp-backend/web/src/main/resources/application-production.properties
+++ b/dmp-backend/web/src/main/resources/application-production.properties
@@ -1,9 +1,9 @@
 dmp.domain = https://opendmp.eu
 
 ####################PERSISTENCE OVERRIDES CONFIGURATIONS##########
-production.database.url=jdbc:postgresql://dl009.madgik.di.uoa.gr:5432/dmptool
-production.database.username=dmpdbad
-production.database.password=kWd4DmPd8@08!2
+database.url=
+database.username=
+database.password=
 
 ####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS##########
 elasticsearch.host = tags-elastic-search
@@ -22,7 +22,7 @@ configuration.h2020template=/tmp/h2020.docx
 
 ####################SPRING MAIL CONFIGURATIONS#################
 spring.mail.default-encoding=UTF-8
-spring.mail.host=dit-gate.di.uoa.gr
+spring.mail.host=
 spring.mail.username=
 spring.mail.password=
 spring.mail.port=25
@@ -32,21 +32,21 @@ spring.mail.properties.mail.smtp.auth=false
 spring.mail.properties.mail.smtp.starttls.enable=true
 
 #############FACEBOOK LOGIN CONFIGURATIONS#########
-facebook.login.clientId=613977555670785
-facebook.login.clientSecret=b656eb30077454dea7b3cfd03b6e4310
+facebook.login.clientId=
+facebook.login.clientSecret=
 facebook.login.namespace=opendmp
 
 #############GOOGLE LOGIN CONFIGURATIONS#########
-google.login.clientId=596924546661-83nhl986pnrpug5h624i5kptuao03dcd.apps.googleusercontent.com
+google.login.clientId=
 
 #############LINKEDIN LOGIN CONFIGURATIONS#########
-linkedin.login.clientId=86w8xorrsdzjud
-linkedin.login.clientSecret=I9t9cjUgDNehcIIi
+linkedin.login.clientId=
+linkedin.login.clientSecret=
 linkedin.login.redirect_uri=https://opendmp.eu/login/linkedin
 
 #############TWITTER LOGIN CONFIGURATIONS#########
-twitter.login.clientId=FBU0tH4J1wgmtJOuBOg0lKkmi
-twitter.login.clientSecret=vDUUabrT8NYgAMKdA0ixWH8QQfjTqclXUPMb15LujgqBgg0Xsf
+twitter.login.clientId=
+twitter.login.clientSecret=
 twitter.login.redirect_uri=https://opendmp.eu/login/twitter
 
 #############B2 ACCESS CONFIGURATIONS#########
@@ -55,6 +55,7 @@ b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.
 b2access.externallogin.redirect_uri=https://opendmp.eu/api/oauth/authorized/b2access
 b2access.externallogin.clientid=
 b2access.externallogin.clientSecret=
+
 #############SPRING DATASOURCE CONFIGURATIONS#########
 spring.datasource.maxIdle: 10
 spring.datasource.max-active: 70
diff --git a/dmp-backend/web/src/main/resources/application-staging.properties b/dmp-backend/web/src/main/resources/application-staging.properties
index 15a1be7f8..c63c84c19 100644
--- a/dmp-backend/web/src/main/resources/application-staging.properties
+++ b/dmp-backend/web/src/main/resources/application-staging.properties
@@ -1,9 +1,9 @@
 dmp.domain = https://devel.opendmp.eu
 
 ####################PERSISTENCE OVERRIDES CONFIGURATIONS##########
-database.url=jdbc:postgresql://develdb1.madgik.di.uoa.gr:5432/dmptool
-database.username=dmptool
-database.password=dmpt00lu$r
+database.url=
+database.username=
+database.password=
 
 ####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS##########
 elasticsearch.host = tags-elastic-search
@@ -22,28 +22,28 @@ configuration.h2020template=/tmp/h2020.docx
 
 ####################SPRING MAIL CONFIGURATIONS#################
 spring.mail.default-encoding=UTF-8
-spring.mail.host=dit-gate.di.uoa.gr
+spring.mail.host=
 spring.mail.port=25
 spring.mail.protocol=smtp
 spring.mail.test-connection=false
 spring.mail.properties.mail.smtp.auth=false
 
 #############FACEBOOK LOGIN CONFIGURATIONS#########
-facebook.login.clientId=613977555670785
-facebook.login.clientSecret=b656eb30077454dea7b3cfd03b6e4310
+facebook.login.clientId=
+facebook.login.clientSecret=
 facebook.login.namespace=opendmp
 
 #############GOOGLE LOGIN CONFIGURATIONS#########
-google.login.clientId=596924546661-83nhl986pnrpug5h624i5kptuao03dcd.apps.googleusercontent.com
+google.login.clientId=
 
 #############LINKEDIN LOGIN CONFIGURATIONS#########
-linkedin.login.clientId=86w8xorrsdzjud
-linkedin.login.clientSecret=I9t9cjUgDNehcIIi
+linkedin.login.clientId=
+linkedin.login.clientSecret=
 linkedin.login.redirect_uri=https://devel.opendmp.eu/login/linkedin
 
 #############TWITTER LOGIN CONFIGURATIONS#########
-twitter.login.clientId=FBU0tH4J1wgmtJOuBOg0lKkmi
-twitter.login.clientSecret=vDUUabrT8NYgAMKdA0ixWH8QQfjTqclXUPMb15LujgqBgg0Xsf
+twitter.login.clientId=
+twitter.login.clientSecret=
 twitter.login.redirect_uri=https://devel.opendmp.eu/login/twitter
 
 #############B2 ACCESS CONFIGURATIONS#########
diff --git a/dmp-backend/web/src/main/resources/application.properties b/dmp-backend/web/src/main/resources/application.properties
index 22f79f6ea..1e799efe0 100644
--- a/dmp-backend/web/src/main/resources/application.properties
+++ b/dmp-backend/web/src/main/resources/application.properties
@@ -8,12 +8,12 @@ eu.eudat.logic.proxy.allowed.host=https://eestore.paas2.uninett.no
 ####################INVITATION MAIL CONFIGURATIONS##############
 ####################GENERIC MAIL CONFIGURATIONS#################
 mail.subject=Invitation to DMP Plan {dmpname}
-mail.from=citesagrdev@gmail.com
+mail.from=
 
 ####################SPRING MAIL CONFIGURATIONS#################
 spring.mail.default-encoding=UTF-8
-spring.mail.host=smtp.gmail.com
-spring.mail.username=citesagrdev@gmail.com
+spring.mail.host=
+spring.mail.username=
 spring.mail.password=w3l0v3CITe
 spring.mail.port=587
 spring.mail.protocol=smtp
@@ -23,34 +23,34 @@ spring.mail.properties.mail.smtp.starttls.enable=true
 
 #############LOGIN CONFIGURATIONS#########
 #############GENERIC LOGIN CONFIGURATIONS#########
-autouser.root.email=root@dmp.com
-autouser.root.password=root
-autouser.root.username=root
+autouser.root.email=
+autouser.root.password=
+autouser.root.username=
 
 #############FACEBOOK LOGIN CONFIGURATIONS#########
-facebook.login.clientId=110586756143149
-facebook.login.clientSecret=522a847f05c873d0222c85109e24f55a
-facebook.login.namespace=eudat
+facebook.login.clientId=
+facebook.login.clientSecret=
+facebook.login.namespace=
 
 #############GOOGLE LOGIN CONFIGURATIONS#########
-google.login.clientId=524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleusercontent.com
+google.login.clientId=
 
 #############LINKEDIN LOGIN CONFIGURATIONS#########
-linkedin.login.clientId=86bl8vfk77clh9
-linkedin.login.clientSecret=2OCO9e3wKylW05Tt
+linkedin.login.clientId=
+linkedin.login.clientSecret=
 linkedin.login.redirect_uri=http://opendmp.eu/login/linkedin
 
 #############TWITTER LOGIN CONFIGURATIONS#########
-twitter.login.clientId=HiR4hQH9HNubKC5iKQy0l4mAZ
-twitter.login.clientSecret=9KZHgkqUO2QFnELSL14jeUvfUacWX23rqD8OW8X0xoRDXOSfKH
+twitter.login.clientId=
+twitter.login.clientSecret=
 twitter.login.redirect_uri=http://opendmp.eu/login/twitter
 
 #############B2 ACCESS CONFIGURATIONS#########
 b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo
 b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token
 b2access.externallogin.redirect_uri=http://opendmp.eu/api/oauth/authorized/b2access
-b2access.externallogin.clientid=eudatdmptool
-b2access.externallogin.clientSecret=A3b*1*92
+b2access.externallogin.clientid=
+b2access.externallogin.clientSecret=
 
 #############FILE STORAGE CONFIGURATIONS#########
 files.storage.temp = temp
diff --git a/dmp-frontend/angular.json b/dmp-frontend/angular.json
index 9468a0ee2..4a86379e3 100644
--- a/dmp-frontend/angular.json
+++ b/dmp-frontend/angular.json
@@ -42,6 +42,23 @@
 									"with": "src/environments/environment.prod.ts"
 								}
 							]
+						},
+						"staging": {
+							"optimization": true,
+							"outputHashing": "all",
+							"sourceMap": false,
+							"extractCss": true,
+							"namedChunks": false,
+							"aot": true,
+							"extractLicenses": true,
+							"vendorChunk": false,
+							"buildOptimizer": true,
+							"fileReplacements": [
+								{
+									"replace": "src/environments/environment.ts",
+									"with": "src/environments/environment.staging.ts"
+								}
+							]
 						}
 					}
 				},
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts
index 90736dd56..a8daf5820 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts
@@ -6,11 +6,11 @@ import { BaseComponent } from '../../../../core/common/base/base.component';
 import { DatasetProfileService } from '../../../../core/services/dataset-profile/dataset-profile.service';
 import { DatasetWizardEditorModel } from '../../../dataset/dataset-wizard/dataset-wizard-editor.model';
 
-@Component({
-	selector: 'app-dataset-profile-preview-component',
-	templateUrl: './dataset-profile-preview.component.html',
-	styleUrls: ['./dataset-profile-preview.component.scss']
-})
+// @Component({
+// 	selector: 'app-dataset-profile-preview-component',
+// 	templateUrl: './dataset-profile-preview.component.html',
+// 	styleUrls: ['./dataset-profile-preview.component.scss']
+// })
 export class DatasetProfilePreviewerComponent extends BaseComponent implements OnInit {
 	formGroup: FormGroup;
 	datasetWizardModel: DatasetWizardEditorModel;
diff --git a/dmp-frontend/src/assets/lang/en.json b/dmp-frontend/src/assets/lang/en.json
deleted file mode 100644
index 9e2127e5d..000000000
--- a/dmp-frontend/src/assets/lang/en.json
+++ /dev/null
@@ -1,499 +0,0 @@
-{
-	"GENERAL": {
-		"VALIDATION": {
-			"REQUIRED": "Required"
-		},
-		"DELETE-CONFIRMATION": {
-			"TITLE": "Warning",
-			"MESSAGE": "Are you sure you want to delete this item?",
-			"POSITIVE": "Yes",
-			"NEGATIVE": "Cancel"
-		},
-		"SNACK-BAR": {
-			"SUCCESSFUL-CREATION": "Created Successfully",
-			"SUCCESSFUL-UPDATE": "Updated Successfully",
-			"SUCCESSFUL-LOGIN": "Successful Login",
-			"SUCCESSFUL-LOGOUT": "Successful Logout",
-			"UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
-			"UNSUCCESSFUL-LOGIN": "Unsuccessful Login"
-		},
-		"ERRORS": {
-			"HTTP-REQUEST-ERROR": "An Unexpected Error Has Occured"
-		},
-		"NAMES": {
-			"DATASET": "Dataset"
-		},
-		"STATUSES": {
-			"EDIT": "Edited",
-			"FINALISED": "Finalized"
-		}
-	},
-	"NAV-BAR": {
-		"TITLE": "OpenDMP",
-		"PROJECTS": "Projects",
-		"DMPS": "DMPs",
-		"DATASETS": "Datasets",
-		"PUBLIC-DATASETS": "Explore OpenDMP",
-		"USERS": "Users",
-		"DATASETS-ADMIN": "Dataset Profiles",
-		"DMP-PROFILES": "DMP Profiles",
-		"ABOUT": "About"
-	},
-	"DATASET-PROFILE-EDITOR": {
-		"TITLE": {
-			"NEW": "New API Client"
-		},
-		"FIELDS": {
-			"DATASET-TITLE": "Dataset Template Name",
-			"ROLES": "Roles"
-		},
-		"STEPS": {
-			"PAGES": "Page Description",
-			"FORM": "Form Description"
-		},
-		"ACTIONS": {
-			"SAVE": "Save",
-			"CANCEL": "Cancel",
-			"DELETE": "Delete",
-			"ADD-PAGE": "Add Page +",
-			"ADD-SECTION": "Add Section +"
-		}
-	},
-	"PROJECT-LISTING": {
-		"TITLE": "Projects",
-		"COLUMNS": {
-			"AVATAR": "Image",
-			"NAME": "Name",
-			"ABBREVIATION": "Abbreviation",
-			"START": "Start",
-			"END": "End",
-			"ACTIONS": "Actions",
-			"DMPS": "DMPs"
-		}
-	},
-	"DMP-LISTING": {
-		"TITLE": "Data Management Plans",
-		"COLUMNS": {
-			"NAME": "Name",
-			"PROJECT": "Project",
-			"PROFILE": "Profile",
-			"CREATION-TIME": "Creation Time",
-			"ORGANISATIONS": "Organisations",
-			"LATEST_VERSION": "Latest Version",
-			"ACTIONS": "Actions",
-			"DATASETS": "Datasets",
-			"STATUS": "Status"
-		},
-		"ACTIONS": {
-			"EDIT": "Edit",
-			"INVITE": "Invite Contributors",
-			"ADD-DATASET": "Add Dataset To DMP",
-			"DATASETS": "List All DMP Datasets",
-			"NEW-VERSION": "New Version",
-			"VIEW-VERSION": "All DMP Versions",
-			"CLONE": "Clone",
-			"DOWNLOAD-XML": "Download XML",
-			"DOWNLOAD-DOCX": "Download Document",
-			"DOWNLOAD-PDF": "Download PDF"
-		}
-	},
-	"DATASET-WIZARD": {
-		"TITLE": {
-			"NEW": "New Dataset Description"
-		},
-		"EDITOR": {
-			"FIELDS": {
-				"EXTERNAL-DATASET-TYPE": "Type"
-			}
-		},
-		"FIRST-STEP": {
-			"TITLE": "Dataset Information",
-			"DMP": "Data Management Plan",
-			"PROFILE": "Dataset Profile"
-		},
-		"SECOND-STEP": {
-			"TITLE": "External References"
-		},
-		"THIRD-STEP": {
-			"TITLE": "Description"
-		},
-		"ACTIONS": {
-			"NEXT": "Next",
-			"BACK": "Back",
-			"DELETE": "Delete",
-			"GO-TO-PROJECT": "Go to Dataset Project",
-			"GO-TO-DMP": "Go to Dataset DMP",
-			"SAVE": "Save",
-			"SAVE-AND-FINALISE": "Save and Finalise",
-			"DOWNLOAD-PDF": "Download PDF",
-			"DOWNLOAD-XML": "Download XML"
-		}
-	},
-	"DATASET-LISTING": {
-		"TITLE": "Datasets",
-		"COLUMNS": {
-			"NAME": "Name",
-			"REFERNCE": "Reference",
-			"PROJECT": "Project",
-			"URI": "Uri",
-			"STATUS": "Status",
-			"DESCRIPTION": "Description",
-			"CREATED": "Created",
-			"ACTIONS": "Actions",
-			"DMP": "Dmp",
-			"PROFILE": "Profile",
-			"DATAREPOSITORIES": "Data Repositories",
-			"REGISTRIES": "Registries",
-			"SERVICES": "Services"
-		},
-		"ACTIONS": {
-			"EDIT": "Edit",
-			"MAKE-IT-PUBLIC": "Make it public",
-			"VIEW": "View"
-		}
-	},
-	"DATASET-PUBLIC-LISTING": {
-		"TITLE": "Published dataset descriptions"
-	},
-	"DATASET-PROFILE-LISTING": {
-		"TITLE": "Dataset Profiles",
-		"COLUMNS": {
-			"NAME": "Name",
-			"REFERNCE": "Reference",
-			"PROJECT": "Project",
-			"URI": "Uri",
-			"STATUS": "Status",
-			"DESCRIPTION": "Description",
-			"CREATED": "Created",
-			"ACTIONS": "Actions",
-			"DMP": "Dmp",
-			"PROFILE": "Profile",
-			"DATAREPOSITORIES": "Data Repositories",
-			"REGISTRIES": "Registries",
-			"SERVICES": "Services"
-		},
-		"ACTIONS": {
-			"EDIT": "Edit",
-			"MAKE-IT-PUBLIC": "Make it public",
-			"VIEW": "View",
-			"CLONE": "Clone"
-		}
-	},
-	"DMP-PROFILE-EDITOR": {
-		"TITLE": {
-			"NEW": "New DMP Profile",
-			"EDIT": "Edit"
-		},
-		"FIELDS": {
-			"LABEL": "Name",
-			"TYPE": "Type",
-			"DATATYPE": "Data Type",
-			"REQUIRED": "Required"
-		},
-		"ACTIONS": {
-			"SAVE": "Save",
-			"CANCEL": "Cancel",
-			"DELETE": "Delete"
-		}
-	},
-	"PROJECT-EDITOR": {
-		"TITLE": {
-			"NEW": "New Project",
-			"EDIT": "Edit"
-		},
-		"FIELDS": {
-			"LABEL": "Title",
-			"ABBREVIATION": "Abbreviation",
-			"URI": "URL",
-			"START": "Start",
-			"END": "End",
-			"DESCRIPTION": "Description",
-			"LOGO": "Project Logo"
-		},
-		"ACTIONS": {
-			"SAVE": "Save",
-			"CANCEL": "Cancel",
-			"DELETE": "Delete",
-			"GO-TO-DMPS": "Go To DMPs"
-		}
-	},
-	"DMP-EDITOR": {
-		"TITLE": {
-			"NEW": "New Data Management Plan",
-			"EDIT": "Edit"
-		},
-		"FIELDS": {
-			"NAME": "Name",
-			"PROJECT": "Project",
-			"DESCRIPTION": "Description",
-			"ORGANISATIONS": "Organisations",
-			"RESEARCHERS": "Researchers",
-			"PROFILES": "Available Dataset Profiles",
-			"PROFILE": "DMP Profile",
-			"GRANT": "Grant",
-			"FUNDER": "Funder"
-		},
-		"ACTIONS": {
-			"GO-TO-PROJECT": "Go To DMP Project",
-			"GO-TO-DATASETS": "Go To Datasets",
-			"SAVE": "Save",
-			"CANCEL": "Cancel",
-			"DELETE": "Delete",
-			"FINALISE": "Finalize"
-		}
-	},
-	"DMP-PROFILE-LISTING": {
-		"TITLE": "DMP Profiles",
-		"COLUMNS": {
-			"NAME": "Name",
-			"STATUS": "Status",
-			"CREATED": "Created"
-		}
-	},
-	"DYNAMIC-FORM": {
-		"FIELDS": {
-			"LABEL": "Label"
-		},
-		"ACTIONS": {
-			"PREVIEW": "Preview",
-			"ADD-PAGE": "Add Page +",
-			"ADD-SECTION": "Add Section +"
-		}
-	},
-	"CRITERIA": {
-		"FILTERS": "Filters",
-		"PROJECTS": {
-			"LIKE": "Search",
-			"PERIOD-FROM": "Project Start",
-			"PERIOD-TO": "Project End",
-			"PROJECT-STATE-TYPE": "Project Status",
-			"TYPES": {
-				"ON-GOING": "On Going",
-				"FINISHED": "Finished"
-			}
-		},
-		"DATASET-PROFILE": {
-			"LIKE": "Search"
-		},
-		"DATA-SETS": {
-			"PERIOD-FROM": "Start",
-			"PERIOD-TO": "End",
-			"STATUS": "Status",
-			"TAGS": "Tags"
-		},
-		"DMP": {
-			"LIKE": "Search",
-			"PROJECTS": "Projects"
-		},
-		"USERS": {
-			"LABEL": "Label",
-			"ROLE": "Role"
-		}
-	},
-	"DATASET-EDITOR": {
-		"TITLE": {
-			"NEW": "New Data Management Plan",
-			"EDIT": "Edit"
-		},
-		"FIELDS": {
-			"NAME": "Name of the Dataset",
-			"DESCRIPTION": "Description",
-			"PROFILE": "Profile",
-			"URI": "Uri",
-			"DMP": "DMP",
-			"DATAREPOSITORIES": "Data Repositories",
-			"REGISTRIES": "Registries",
-			"SERVICES": "Services",
-			"EXTERNAL-DATASETS": "External Datasets",
-			"EXTERNAL-DATASET-TYPE": "External Datasets Type",
-			"EXTERNAL-DATASET-INFO": "External Datasets Info",
-			"DATAREPOSITORIES-INFO": "Data Repositories Info",
-			"TAGS": "Tags",
-			"CREATE": "Create New"
-		},
-		"ACTIONS": {
-			"SAVE": "Save",
-			"CANCEL": "Cancel",
-			"DELETE": "Delete"
-		}
-	},
-	"INVITATION-EDITOR": {
-		"TITLE": "Send Invitations for ",
-		"AUTOCOMPLETE-TITLE": "User/Email",
-		"ACTIONS": {
-			"SEND-INVITATION": "Send Invitations",
-			"CANCEL": "Cancel"
-		}
-	},
-	"USERS": {
-		"LISTING": {
-			"TITLE": "Users",
-			"EMAIL": "Email",
-			"LAST-LOGGED-IN": "Last Logged In",
-			"LABEL": "Label",
-			"ROLES": "Roles"
-		}
-	},
-	"TYPES": {
-		"APP-ROLE": {
-			"ADMIN": "Admin",
-			"USER": "User",
-			"MANAGER": "Manager"
-		},
-		"DMP-PROFILE-FIELD": {
-			"DATA-TYPE": {
-				"DATE": "Date",
-				"NUMBER": "Number",
-				"TEXT": "Text"
-			},
-			"TYPE": {
-				"INPUT": "Input"
-			}
-		},
-		"DATASET-STATUS": {
-			"DRAFT": "Draft",
-			"FINALISED": "Finalized"
-		},
-		"EXTERNAL-DATASET-TYPE": {
-			"SOURCE": "Source",
-			"OUTPUT": "Output"
-		},
-		"DMP": {
-			"FINALISED": "Finalized",
-			"DRAFT": "Draft"
-		}
-	},
-	"ADDRESEARCHERS-EDITOR": {
-		"TITLE": "Add a Researcher",
-		"FIRST_NAME": "First Name",
-		"LAST_NAME": "Last Name",
-		"ACTIONS": {
-			"SAVE": "Save",
-			"CANCEL": "Cancel"
-		}
-	},
-	"DMP-WIZARD": {
-		"FIRST-STEP": {
-			"DMP": "DMP Editor",
-			"DATASETS": "Datasets"
-		},
-		"ACTIONS": {
-			"NEXT": "Next",
-			"BACK": "Back",
-			"SAVE": "Save"
-		}
-	},
-	"DATASET-PROFILE": {
-		"PREVIEW": "Preview",
-		"FORM-DESCRIPTION": "Form Description",
-		"PAGES-DESCRIPTION": "Pages Description"
-	},
-	"RECENT-ACTIVITY": {
-		"MY-TITLE-PROJECT": "My Recent Project Activity",
-		"MY-TITLE-DMP": "My Recent DMP Activity",
-		"MY-TITLE-DATASET": "My Recent Dataset Activity"
-	},
-	"FILE-UPLOADER": {
-		"DEFAULT": "Choose a file",
-		"PROJECT": "",
-		"UPLOAD": "Upload"
-	},
-	"URL-LISTING-COMPONENT": {
-		"SHOW-MORE": "Show more"
-	},
-	"HOMEPAGE": {
-		"OPEN-DMPS": {
-			"STATS": "OpenDMP Dashboard"
-		},
-		"MY-DMPS": {
-			"STATS": "My Dashboard"
-		}
-	},
-	"ABOUT": {
-		"TITLE": "-Our Mission-",
-		"MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementationsolution.",
-		"CONTRIBUTORS": "Contributors"
-	},
-	"DASHBOARD": {
-		"MY-PROJECTS": "My Projects",
-		"PROJECTS": "Projects",
-		"MY-DMPS": "My DMPs",
-		"DMPS": "DMPs",
-		"MY-DATASETS": "My Datasets",
-		"DATASETS": "Datasets",
-		"SEARCH": "Search"
-	},
-	"USER-DIALOG": {
-		"USER-PROFILE": "My Profile",
-		"EXIT": "Exit "
-	},
-	"USER-PROFILE": {
-		"SETTINGS": {
-			"TITLE": "Settings",
-			"TIMEZONE": "Time Zone",
-			"CULTURE": "Culture",
-			"LANGUAGE": "Language"
-		},
-		"ASSOCIATED-DMPS": "Associated DMPs",
-		"DMPS": {
-			"SHOW-ALL": "Show All",
-			"CREATOR": "Creator",
-			"MEMBER": "Member"
-		}
-	},
-	"DATASET-REFERENCED-MODELS": {
-		"SERVICES": {
-			"TITLE": "Add New Service",
-			"LABEL": "Label",
-			"ABBREVIATION": "Abbreviation",
-			"URI": "Uri"
-		},
-		"DATA-REPOSITORY": {
-			"TITLE": "Add New Service",
-			"LABEL": "Label",
-			"ABBREVIATION": "Abbreviation",
-			"URI": "Uri"
-		},
-		"EXTERNAL-DATASET": {
-			"TITLE": "Add New Service",
-			"LABEL": "Label",
-			"ABBREVIATION": "Abbreviation"
-		},
-		"REGISTRY": {
-			"TITLE": "Add New Service",
-			"LABEL": "Label",
-			"ABBREVIATION": "Abbreviation",
-			"URI": "Uri"
-		}
-	},
-	"FACET-SEARCH": {
-		"FILTER": "Filter",
-		"PROJECT-STATUS": {
-			"TITLE": "Project Status",
-			"OPTIONS": {
-				"ACTIVE": "Active",
-				"INACTIVE": "Inactive"
-			}
-		},
-		"PROJECT": {
-			"TITLE": "Project",
-			"FILTER": "Filter Projects"
-		},
-		"PROFILES": {
-			"TITLE": "Dataset specification"
-		},
-		"DMP-ORGANISATIONS": {
-			"TITLE": "DMP Organisations",
-			"FILTER": "Filter Organisations"
-		}
-	},
-	"DMP-FINALISE-DIALOG": {
-		"SUBMIT": "Submit",
-		"FINALISE-TITLE": "Do you want to finalise any of the following Datasets?",
-		"ALREADY-FINALISED-DATASETS": "Already Finalized Datasets",
-		"NONE": "None",
-		"VALIDATION": {
-			"AT-LEAST-ONE-DATASET-FINALISED": "You need to have at least one Dataset Finalized"
-		}
-	}
-}
diff --git a/dmp-frontend/src/assets/lang/gr.json b/dmp-frontend/src/assets/lang/gr.json
deleted file mode 100644
index 0d5810d52..000000000
--- a/dmp-frontend/src/assets/lang/gr.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "GENERAL": {
-    "VALIDATION": {
-      "REQUIRED": "Required"
-    }
-  },
-  "USER-PROFILE": {
-    "SETTINGS": {
-      "TITLE": "Ρυθμίσεις",
-      "TIMEZONE": "Ζώνη Ώρας",
-      "CULTURE": "Κουλτούρα",
-      "LANGUAGE": "Γλώσσα"
-    },
-    "ASSOCIATED-DMPS": "Συσχετιζόμενα DMPs",
-    "DMPS": {
-      "SHOW-ALL": "Όλα",
-      "CREATOR": "Δημιουργός",
-      "MEMBER": "Μέλος"
-    }
-  }
-}
diff --git a/dmp-frontend/src/environments/environment.prod.ts b/dmp-frontend/src/environments/environment.prod.ts
index d60730b63..411ef8de1 100644
--- a/dmp-frontend/src/environments/environment.prod.ts
+++ b/dmp-frontend/src/environments/environment.prod.ts
@@ -9,19 +9,19 @@ export const environment = {
 	defaultCulture: 'en-US',
 	loginProviders: {
 		enabled: [1, 2, 3, 4, 5],
-		facebookConfiguration: { clientId: '613977555670785' },
-		googleConfiguration: { clientId: '596924546661-83nhl986pnrpug5h624i5kptuao03dcd.apps.googleusercontent.com' },
+		facebookConfiguration: { clientId: '' },
+		googleConfiguration: { clientId: '' },
 		linkedInConfiguration: {
-			clientId: '86w8xorrsdzjud',
+			clientId: '',
 			oauthUrl: 'https://www.linkedin.com/oauth/v2/authorization',
 			redirectUri: 'http://localhost:4200/login/linkedin',
 		},
 		twitterConfiguration: {
-			clientId: 'HiR4hQH9HNubKC5iKQy0l4mAZ',
+			clientId: '',
 			oauthUrl: 'https://api.twitter.com/oauth/authenticate'
 		},
 		b2accessConfiguration: {
-			clientId: 'eudatdmptool',
+			clientId: '',
 			oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz',
 			redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access'
 		}
diff --git a/dmp-frontend/src/environments/environment.staging.ts b/dmp-frontend/src/environments/environment.staging.ts
index ea01136e9..ef77b449e 100644
--- a/dmp-frontend/src/environments/environment.staging.ts
+++ b/dmp-frontend/src/environments/environment.staging.ts
@@ -9,21 +9,21 @@ export const environment = {
 	defaultCulture: 'en-US',
 	loginProviders: {
 		enabled: [1, 2, 3, 4, 5],
-		facebookConfiguration: { clientId: '613977555670785' },
-		googleConfiguration: { clientId: '596924546661-83nhl986pnrpug5h624i5kptuao03dcd.apps.googleusercontent.com' },
+		facebookConfiguration: { clientId: '' },
+		googleConfiguration: { clientId: '' },
 		linkedInConfiguration: {
-			clientId: '86w8xorrsdzjud',
+			clientId: '',
 			oauthUrl: 'https://www.linkedin.com/oauth/v2/authorization',
 			redirectUri: 'https://devel.opendmp.eu/login/linkedin',
 		},
 		twitterConfiguration: {
-			clientId: 'HiR4hQH9HNubKC5iKQy0l4mAZ',
+			clientId: '',
 			oauthUrl: 'https://api.twitter.com/oauth/authenticate'
 		},
 		b2accessConfiguration: {
-			clientId: 'eudatdmptool',
+			clientId: '',
 			oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz',
-			redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access'
+			redirectUri: 'http://devel.opendmp.eu/api/oauth/authorized/b2access'
 		}
 	},
 	logging: {
diff --git a/dmp-frontend/src/environments/environment.ts b/dmp-frontend/src/environments/environment.ts
index 1ed5d69ff..76c1156eb 100644
--- a/dmp-frontend/src/environments/environment.ts
+++ b/dmp-frontend/src/environments/environment.ts
@@ -9,19 +9,19 @@ export const environment = {
 	defaultCulture: 'en-US',
 	loginProviders: {
 		enabled: [1, 2, 3, 4, 5, 6],
-		facebookConfiguration: { clientId: '613977555670785' },
-		googleConfiguration: { clientId: '524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleusercontent.com' },
+		facebookConfiguration: { clientId: '' },
+		googleConfiguration: { clientId: '' },
 		linkedInConfiguration: {
-			clientId: '86bl8vfk77clh9',
+			clientId: '',
 			oauthUrl: 'https://www.linkedin.com/oauth/v2/authorization',
 			redirectUri: 'http://localhost:4200/login/linkedin'
 		},
 		twitterConfiguration: {
-			clientId: 'HiR4hQH9HNubKC5iKQy0l4mAZ',
+			clientId: '',
 			oauthUrl: 'https://api.twitter.com/oauth/authenticate'
 		},
 		b2accessConfiguration: {
-			clientId: 'eudatdmptool',
+			clientId: '',
 			oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz',
 			redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access'
 		}