Finished removing RMI (node) code