More code clean up again.

Hmmm.. not sure what happened there..