Got rid of some dead code