x86_64: Cleanup of code for master