Fixed config of certificate
Removed some unused code, and removed code not in use
Clean-up code
Merge branch 'feature/certificate_store' into develop