A few fixes
Removed unnecessary remote login support