Build Fix -- Remove some duplicate symbol defs to appease ld.