Some cleanup and make this thing run again.