Some code clean-up that I forgot