revert __int64 changes
a little more cleanup