Small software backend cleanup.