More cleanup. Made sure x64 works.