diff --git a/source/Main.gd b/source/Main.gd
index 9d64727..1f18dac 100644
--- a/source/Main.gd
+++ b/source/Main.gd
@@ -29,6 +29,7 @@ var autoshift_action = ""
 var playing = false
 
 func new_game(level):
+	$Start.visible = false
 	$Matrix/GridMap.clear()
 	if current_piece:
 		remove_child(current_piece)
@@ -38,7 +39,6 @@ func new_game(level):
 	autoshift_action = ""
 	next_piece = random_piece()
 	$MidiPlayer.position = 0
-	$Start.visible = false
 	$Stats.new_game(level)
 	new_piece()
 	resume()
@@ -51,7 +51,6 @@ func new_piece():
 	next_piece.translation = $Next/Position3D.translation
 	if current_piece.move(THERE):
 		$DropTimer.start()
-		$LockDelay.start()
 		current_piece_held = false
 	else:
 		game_over()
diff --git a/source/Tetrominos/TetroI.gd b/source/Tetrominos/TetroI.gd
index 6f67498..e7e1b35 100644
--- a/source/Tetrominos/TetroI.gd
+++ b/source/Tetrominos/TetroI.gd
@@ -1,7 +1,5 @@
 extends "Tetromino.gd"
 
-const CLOCKWISE = -1
-const COUNTERCLOCKWISE = 1
 const SUPER_ROTATION_SYSTEM = [
     {
         COUNTERCLOCKWISE: [
diff --git a/source/Tetrominos/TetroJ.gd b/source/Tetrominos/TetroJ.gd
deleted file mode 100644
index fe1809a..0000000
--- a/source/Tetrominos/TetroJ.gd
+++ /dev/null
@@ -1,2 +0,0 @@
-extends "Tetromino.gd"
-
diff --git a/source/Tetrominos/TetroJ.tscn b/source/Tetrominos/TetroJ.tscn
index d3e5c1f..aff0e9b 100644
--- a/source/Tetrominos/TetroJ.tscn
+++ b/source/Tetrominos/TetroJ.tscn
@@ -1,9 +1,8 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://Tetrominos/TetroJ.gd" type="Script" id=1]
+[ext_resource path="res://Tetrominos/Tetromino.gd" type="Script" id=1]
 [ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2]
 
-
 [node name="TetroJ" type="Spatial" index="0"]
 
 script = ExtResource( 1 )
diff --git a/source/Tetrominos/TetroL.gd b/source/Tetrominos/TetroL.gd
deleted file mode 100644
index fe1809a..0000000
--- a/source/Tetrominos/TetroL.gd
+++ /dev/null
@@ -1,2 +0,0 @@
-extends "Tetromino.gd"
-
diff --git a/source/Tetrominos/TetroL.tscn b/source/Tetrominos/TetroL.tscn
index ee586cf..064aa6b 100644
--- a/source/Tetrominos/TetroL.tscn
+++ b/source/Tetrominos/TetroL.tscn
@@ -1,9 +1,8 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://Tetrominos/TetroL.gd" type="Script" id=1]
+[ext_resource path="res://Tetrominos/Tetromino.gd" type="Script" id=1]
 [ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2]
 
-
 [node name="TetroL" type="Spatial" index="0"]
 
 script = ExtResource( 1 )
diff --git a/source/Tetrominos/TetroO.gd b/source/Tetrominos/TetroO.gd
index 76784a2..4a3f063 100644
--- a/source/Tetrominos/TetroO.gd
+++ b/source/Tetrominos/TetroO.gd
@@ -1,4 +1,4 @@
 extends "Tetromino.gd"
 
 func rotate(direction):
-	pass
\ No newline at end of file
+	return 0
\ No newline at end of file
diff --git a/source/Tetrominos/TetroS.gd b/source/Tetrominos/TetroS.gd
deleted file mode 100644
index fe1809a..0000000
--- a/source/Tetrominos/TetroS.gd
+++ /dev/null
@@ -1,2 +0,0 @@
-extends "Tetromino.gd"
-
diff --git a/source/Tetrominos/TetroS.tscn b/source/Tetrominos/TetroS.tscn
index ab0f27e..4d8953a 100644
--- a/source/Tetrominos/TetroS.tscn
+++ b/source/Tetrominos/TetroS.tscn
@@ -1,9 +1,8 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://Tetrominos/TetroS.gd" type="Script" id=1]
+[ext_resource path="res://Tetrominos/Tetromino.gd" type="Script" id=1]
 [ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2]
 
-
 [node name="TetroS" type="Spatial" index="0"]
 
 script = ExtResource( 1 )
diff --git a/source/Tetrominos/TetroZ.gd b/source/Tetrominos/TetroZ.gd
deleted file mode 100644
index fe1809a..0000000
--- a/source/Tetrominos/TetroZ.gd
+++ /dev/null
@@ -1,2 +0,0 @@
-extends "Tetromino.gd"
-
diff --git a/source/Tetrominos/TetroZ.tscn b/source/Tetrominos/TetroZ.tscn
index b1f0eec..5474f28 100644
--- a/source/Tetrominos/TetroZ.tscn
+++ b/source/Tetrominos/TetroZ.tscn
@@ -1,9 +1,8 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://Tetrominos/TetroZ.gd" type="Script" id=1]
+[ext_resource path="res://Tetrominos/Tetromino.gd" type="Script" id=1]
 [ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2]
 
-
 [node name="TetroZ" type="Spatial" index="0"]
 
 script = ExtResource( 1 )