HACK: add arch/PowerPC and cleanup