remove XXX for the money part, although still some more work is needed