backup.
Remove unnecessary OO.
Merge branch 'simplify_hosts'
Fix encoding bug
Remove OO to simplify