A couple of coverage tweaks
Remove configuration migration code

Finally.