Eliminated "thing" references (from old code base)