Cleanup from no longer used code in issue 141.