a couple of cleanup commits