Checking in some code clean up.