JBEHAVE-1001:  Cleanup.