Removed old armadillo (until my PR is accepted).