Cleanup, now ready for merge.