Cleanup on strong saturation code