Cleanup of fees2 bracnh

A cleaned up version of the fees2 branch.

Please put this one in testing and see whether it works. If it doesn't, we'll go for fees2 without cleanup.