Don't do extra API calls to get dice values
Some more API cleanups