WIP: Cleanup
Fix forget node test