Clean up env. variables, secrets and config files that no longer is in use

[einari]

When renaming any of these we just keep adding - while it should in fact delete things that aren't in use.