Don't need 64bit, and more cleanup