Fixed serializable error on slave nodes

Fixed the serializable error on slave nodes, and now rebase and
reintegration will work correctly on a remote node.
Removed some code that was erroneously committed.

Removed some code that was erroneously committed.