Code Cleanup/SSL Transition