Move main node cleanup back

Summary: If someone wants the node to be cleared out, they will have to
do it themselves.

Auditors: alpert