Cleanup for CR #91
CR #91