64-bit build cleanup