Remove sammy bloat and check_spo