Clean up of configuration and preparations for SSL support