Remove unused patches

Replace remaining `mycroft` imports with new package paths
Cleanup unused imports

neon_core/__init__.py

@@ -25,15 +25,3 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# TODO: Patching for ovos-core 0.0.7
-import ovos_utils.messagebus
-from ovos_utils.events import get_handler_name, create_wrapper, EventContainer
-ovos_utils.messagebus.get_handler_name = get_handler_name
-ovos_utils.messagebus.create_wrapper = create_wrapper
-ovos_utils.messagebus.EventContainer = EventContainer
-
-
-# TODO: Patching out Backend Client
-from ovos_backend_client.backends.offline import OfflineBackend

neon_core/launcher.py

@@ -26,8 +26,8 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from mycroft.lock import Lock
-from mycroft.util import wait_for_exit_signal, reset_sigint_handler
+from ovos_utils import wait_for_exit_signal
+from ovos_utils.process_utils import reset_sigint_handler, PIDLock as Lock
 
 from neon_audio.service import NeonPlaybackService
 from neon_messagebus.service import NeonBusService

neon_core/skills/__init__.py

@@ -26,12 +26,8 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from neon_core.skills.decorators import intent_handler, intent_file_handler, \
-    resting_screen_handler, conversational_intent
-
-# TODO: Resolve remote config bug in skill settings
-import neon_core.skills.patched_skill_settings
-
+# TODO: Deprecate `conversational_intent`
+from neon_core.skills.decorators import conversational_intent
 
 # Backwards-compat import
 from ovos_workshop.decorators import intent_handler, intent_file_handler, \

neon_core/skills/intent_service.py

@@ -46,7 +46,7 @@
 from neon_core.configuration import Configuration
 from neon_core.language import get_lang_config
 
-from ovos_core.intent_services import IntentService, ConverseService
+from ovos_core.intent_services import IntentService, ConverseService, IntentMatch
 
 try:
     from neon_utterance_translator_plugin import UtteranceTranslator

neon_core/util/skill_utils.py

@@ -26,7 +26,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import json
 import re
 
 from copy import copy