Add some cleanup to ST2 to prevent random downgrades