cleanup misc fixes and needed content from previous commits related to ssl implementation