Final cleanup. Branch now looks like what it's supposed to.