remove axes
add context state guard