code clean-up that was missing in the last commit