remove those ugly macros in cpu