diff --git a/src/share/vm/jfr/jfr.cpp~ b/src/share/vm/jfr/jfr.cpp~
deleted file mode 100644
index 88b9047e6a88ae533235c36b7c6478fed85a53a8..0000000000000000000000000000000000000000
--- a/src/share/vm/jfr/jfr.cpp~
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "jfr/jfr.hpp"
-#include "jfr/leakprofiler/leakProfiler.hpp"
-#include "jfr/periodic/sampling/jfrThreadSampler.hpp"
-#include "jfr/recorder/jfrRecorder.hpp"
-#include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
-#include "jfr/recorder/repository/jfrEmergencyDump.hpp"
-#include "jfr/recorder/service/jfrOptionSet.hpp"
-#include "jfr/support/jfrThreadLocal.hpp"
-#include "runtime/java.hpp"
-
-bool Jfr::is_enabled() {
-  return JfrRecorder::is_enabled();
-}
-
-bool Jfr::is_disabled() {
-  return JfrRecorder::is_disabled();
-}
-
-bool Jfr::is_recording() {
-  return JfrRecorder::is_recording();
-}
-
-void Jfr::on_vm_init() {
-  if (!JfrRecorder::on_vm_init()) {
-    vm_exit_during_initialization("Failure when starting JFR on_vm_init");
-  }
-}
-
-void Jfr::on_vm_start() {
-  if (!JfrRecorder::on_vm_start()) {
-    vm_exit_during_initialization("Failure when starting JFR on_vm_start");
-  }
-}
-
-void Jfr::on_unloading_classes() {
-  if (JfrRecorder::is_created()) {
-    JfrCheckpointManager::write_type_set_for_unloaded_classes();
-  }
-}
-
-void Jfr::on_thread_exit(JavaThread* thread) {
-  JfrThreadLocal::on_exit(thread);
-}
-
-void Jfr::on_thread_destruct(Thread* thread) {
-  if (JfrRecorder::is_created()) {
-    JfrThreadLocal::on_destruct(thread);
-  }
-}
-
-void Jfr::on_vm_shutdown(bool exception_handler) {
-  JfrRecorder::set_is_shutting_down();
-  if (JfrRecorder::is_recording()) {
-    JfrEmergencyDump::on_vm_shutdown(exception_handler);
-  }
-}
-
-void Jfr::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) {
-  LeakProfiler::oops_do(is_alive, f);
-}
-
-bool Jfr::on_flight_recorder_option(const JavaVMOption** option, char* delimiter) {
-  return JfrOptionSet::parse_flight_recorder_option(option, delimiter);
-}
-
-bool Jfr::on_start_flight_recording_option(const JavaVMOption** option, char* delimiter) {
-  return JfrOptionSet::parse_start_flight_recording_option(option, delimiter);
-}
-
-Thread* Jfr::sampler_thread() {
-  return JfrThreadSampling::sampler_thread();
-}
diff --git a/src/share/vm/jfr/jfr.hpp~ b/src/share/vm/jfr/jfr.hpp~
deleted file mode 100644
index 221ab8856ad346b8c2c2b32af7d78a52f260f4ad..0000000000000000000000000000000000000000
--- a/src/share/vm/jfr/jfr.hpp~
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_JFR_JFR_HPP
-#define SHARE_VM_JFR_JFR_HPP
-
-#include "jni.h"
-#include "memory/allocation.hpp"
-
-class BoolObjectClosure;
-class JavaThread;
-class OopClosure;
-class Thread;
-
-extern "C" void JNICALL jfr_register_natives(JNIEnv*, jclass);
-
-//
-// The VM interface to Flight Recorder.
-//
-class Jfr : AllStatic {
- public:
-  static bool is_enabled();
-  static bool is_disabled();
-  static bool is_recording();
-  static void on_vm_init();
-  static void on_vm_start();
-  static void on_unloading_classes();
-  static void on_thread_exit(JavaThread* thread);
-  static void on_thread_destruct(Thread* thread);
-  static void on_vm_shutdown(bool exception_handler = false);
-  static bool on_flight_recorder_option(const JavaVMOption** option, char* delimiter);
-  static bool on_start_flight_recording_option(const JavaVMOption** option, char* delimiter);
-  static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f);
-  static Thread* sampler_thread();
-};
-
-#endif // SHARE_VM_JFR_JFR_HPP