Deleting some dead code