Cleanup pass on makedevs. Need to test it before promoting.