diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp
index 8ecc51ce6..05aed5902 100644
--- a/Machines/Oric/Oric.cpp
+++ b/Machines/Oric/Oric.cpp
@@ -79,14 +79,9 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
 		}
 	}
 
-//	if(_typer && operation == CPU6502::BusOperation::ReadOpcode && address == 0xEE22)
-//	{
-//		if(!_typer->type_next_character())
-//			_typer.reset();
-//	}
-	if(_typer)
+	if(_typer && operation == CPU6502::BusOperation::ReadOpcode && address == 0xF495)
 	{
-		_typer->update(1);
+		if(!_typer->type_next_character()) _typer.reset();
 	}
 
 	_via.run_for_cycles(1);
diff --git a/Machines/Oric/Oric.hpp b/Machines/Oric/Oric.hpp
index b768c8ed9..697dfe706 100644
--- a/Machines/Oric/Oric.hpp
+++ b/Machines/Oric/Oric.hpp
@@ -89,8 +89,6 @@ class Machine:
 
 		// for Utility::TypeRecipient
 		virtual bool typer_set_next_character(Utility::Typer *typer, char character, int phase);
-		virtual int get_typer_delay() { return _typer_delay; }
-		virtual int get_typer_frequency() { return 40000; }
 
 	private:
 		// RAM and ROM