arms code cleanup / rdy 4 testing