Cleanup 64bit and remove deprecated functions

Change-Id: I8f4570af8ab7da05831258dd264118b28ce5d352
15 files changed