I removed the figure environment token, because I would always use the figure environment and this was a bit of a nuisance. Do you agree that this was a good move?