Removing untested code, fixing compile warnings/errors on ppc