Doing some code clean-up.
Fixing something left over from testing.