Removed debug code, more tests for staged-for-deletion.