Cleaup after merge. This probably should have gone in tested, but um,
yeah. Oops. Next commit will have some new code.
I'm just making a mess now.