REL-2015: Code cleanup in axis code.