Bug fix.

This commit fell through when moving repos. Actually done Feb 17th.
Cleanup

This commit fell through when switching repos. Actually done Feb 17th.