Rename classes
Add comment
Remove unused code (part of migration to node-client)
Migrate to node client