JBEHAVE-789:  Cleanup.