cleanup WIP
cleanup WIP 2
HTTPS closed hotfix
Cleanup completed