cleaned up several Spice2 implementations