Cleaning up, should now build on x64