cleanup to be more similar to RAX