diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ChipCanvas.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ChipCanvas.kt
deleted file mode 100644
index 93575206..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ChipCanvas.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.pokeranalytics.android.ui.modules.handhistory.replayer
-
-import android.graphics.Canvas
-
-class ChipCanvas : Canvas() {
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/HandStep.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/HandStep.kt
index 169cd7ea..b08ea015 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/HandStep.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/HandStep.kt
@@ -7,22 +7,10 @@ import net.pokeranalytics.android.model.realm.handhistory.Action
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
 import net.pokeranalytics.android.ui.modules.handhistory.model.ActionList
 
-
-
 interface HandStep {
 
 	val street: Street
 
-//	abstract class Animation(override val street: Street) : HandStep {
-//		override fun frames(configuration: ReplayerConfiguration, canvas: Canvas, context: Context, update: () -> Unit) {
-//			TODO("Not yet implemented")
-//		}
-//	}
-//
-//	class GatherChips(street: Street) : Animation(street)
-//
-//	class DistributeChips(street: Street) : Animation(street)
-
 	fun frames(animator: ReplayerAnimator, canvas: Canvas, context: Context, update: () -> (Unit))
 
 	companion object {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/PlayerCanvas.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/PlayerCanvas.kt
deleted file mode 100644
index a1d39fc6..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/PlayerCanvas.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package net.pokeranalytics.android.ui.modules.handhistory.replayer
-
-import android.graphics.Canvas
-import net.pokeranalytics.android.model.realm.Player
-import net.pokeranalytics.android.model.realm.handhistory.Card
-
-class PlayerCanvas : Canvas() {
-
-	fun setPlayer(player: Player) {
-
-	}
-
-	fun setRemainingStack(stack: Double) {
-
-	}
-
-	fun setPicture(file: String) {
-
-	}
-
-	fun setCards(cards: List<Card>) {
-
-	}
-
-	fun showCards(show: Boolean) {
-
-	}
-
-	fun fold() {
-
-	}
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TestActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TestActivity.kt
deleted file mode 100644
index 5b632005..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TestActivity.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package net.pokeranalytics.android.ui.modules.handhistory.replayer
-
-import android.graphics.Bitmap
-import android.os.Bundle
-import kotlinx.android.synthetic.main.activity_test.*
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.activity.components.BaseActivity
-
-class TestActivity : BaseActivity() {
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(R.layout.activity_test)
-
-		initUI()
-	}
-
-	fun initUI() {
-		showFragment(ReplayerFragment(), R.id.container)
-	}
-
-	override fun onStart() {
-		super.onStart()
-//		val bm = Bitmap.createBitmap(
-//			this.container.width,
-//			this.container.height,
-//			Bitmap.Config.ARGB_8888)
-//
-//		val tc = TableCanvas(bm)
-//		tc.load(this)
-//
-//		this.image_view.setImageBitmap(bm)
-	}
-
-}
\ No newline at end of file