upgrade v4 to use money 6.1, minor cleanup