general stability cleanup