Cleanup for CR #91