Cleanup for apparent final working copy

I think it all works?