Remove old broken code, and some debug code I left in last time. Oops.