Tighten up code.
Remove test that was commented out anyway.