Finish up dev section and remove last vestige of xold