x86: cleanup unused stuff