Revert "Added ttwj's updates and fixed ssh"

This reverts commit 2b72145c48707fec1b3133b2c03a10057f2ed878.