Yeah sounds like it just needs a bit of cleanup to remove the unused code. I don't have a strong opinion about a nostat enum.