Removed unused code

Got rid of some dead code