diff --git a/bin/.gitignore b/bin/.gitignore
index 4a6964c..66905d0 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-/view/
-/controller/
-/model/
-=======
 /.DS_Store
 /controller/
 /model/
 /view/
->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
index d9e4bf9..158a0ab 100644
Binary files a/bin/model/CardStack.class and b/bin/model/CardStack.class differ
diff --git a/bin/model/Handler.class b/bin/model/Handler.class
deleted file mode 100644
index 168fca9..0000000
Binary files a/bin/model/Handler.class and /dev/null differ
diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class
index 2c088ec..56055d0 100644
Binary files a/bin/view/TileButton.class and b/bin/view/TileButton.class differ
diff --git a/src/model/Handler.java b/src/model/Handler.java
deleted file mode 100644
index 8515231..0000000
--- a/src/model/Handler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package model;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-public class Handler implements ActionListener {
-	private int rent, price, locationOnBoard;
-	private Tile tile;
-
-	public Handler(int price, int rent, Tile tile, int locationOnBoard,
-			GameBoard board) {
-		this.price = price;
-		this.rent = rent;
-		this.tile = tile;
-		this.locationOnBoard = locationOnBoard;
-
-	}
-
-	public void actionPerformed(ActionEvent event) {
-		// refer to getLandedOn? Or one of the decision/card windows? How do i do this i am tired 
-
-	}
-
-}
diff --git a/src/view/TileButton.java b/src/view/TileButton.java
index c3c06c8..3aafc82 100644
--- a/src/view/TileButton.java
+++ b/src/view/TileButton.java
@@ -11,7 +11,6 @@ public class TileButton extends JButton {
 
 	private static final long serialVersionUID = 1L;
 	private Tile tile;
-	private int rent, price;
 
 	public TileButton(String name, int TileOnBoard, GameBoard board) {
 		super(name);
@@ -20,27 +19,11 @@ public class TileButton extends JButton {
 		// this.setOpaque(false);
 		this.setContentAreaFilled(false);
 		// this.setBorderPainted(false);
-
-		this.setInts();
 		this.setVisible(true);
-		Handler hand = new Handler(price, rent, tile, TileOnBoard,
-				board);
-		this.addActionListener(hand);
 
 	}
 
-	public void setInts() {
- 
-		if (this.tile instanceof Tile) {
-			/*
-			 * i dont actually really like this method 
-			 * but i think it should be like that iterator in cash flow
-			 * that determines moving over the tiles and if it's landed on
-			 * the gui should be brought up already in the handler method
-			 */
-		}
 
-	}
 
 	public void paint(Graphics g) { // Do nothing here }