Small improvements
Change server node address
Remove unused code