Clean up some axis and fields