- Remove SSL KeyStore
- Refactoring to remove some static methods