Cleaning up a bunch of leftover status tracking stuff.
Fixing the D3 example