diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 201e8d69494ac..3a8f9126b498d 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -926,7 +926,6 @@ impl<'feat> ExpansionConfig<'feat> {
         fn enable_trace_macros = trace_macros,
         fn enable_allow_internal_unstable = allow_internal_unstable,
         fn enable_custom_derive = custom_derive,
-        fn enable_pushpop_unsafe = pushpop_unsafe,
     }
 }
 
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 90cca3129dcf2..ba6e752d310e0 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -127,9 +127,6 @@ declare_features! (
     (active, reflect, "1.0.0", Some(27749)),
     (active, unboxed_closures, "1.0.0", Some(29625)),
 
-    // rustc internal.
-    (active, pushpop_unsafe, "1.2.0", None),
-
     (active, allocator, "1.0.0", Some(27389)),
     (active, fundamental, "1.0.0", Some(29635)),
     (active, main, "1.0.0", Some(29634)),
@@ -313,9 +310,6 @@ declare_features! (
     // Allows #[target_feature(...)]
     (active, target_feature, "1.15.0", None),
 
-    // Allow safe suggestions for potential type conversions.
-    (active, safe_suggestion, "1.0.0", Some(37384)),
-
     // `extern "ptx-*" fn()`
     (active, abi_ptx, "1.15.0", None),
 
@@ -344,6 +338,7 @@ declare_features! (
     // Allows using items which are missing stability attributes
     // rustc internal
     (removed, unmarked_api, "1.0.0", None),
+    (removed, pushpop_unsafe, "1.2.0", None),
 );
 
 declare_features! (
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index b0da6647eb900..10b509d58bf73 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -165,10 +165,10 @@ pub fn check(path: &Path, bad: &mut bool) {
 
     // FIXME get this whitelist empty.
     let whitelist = vec![
-        "abi_ptx", "simd", "safe_suggestion", "macro_reexport",
+        "abi_ptx", "simd", "macro_reexport",
         "more_struct_aliases", "static_recursion", "reflect",
         "quote", "cfg_target_has_atomic", "custom_attribute",
-        "default_type_parameter_fallback", "pushpop_unsafe",
+        "default_type_parameter_fallback",
         "use_extern_macros", "staged_api", "const_indexing",
         "unboxed_closures", "stmt_expr_attributes",
         "cfg_target_thread_local", "unwind_attributes",