SSL certificates
Minor changes
Removing some useless stuff
Merge conflicts