Deleted a bunch of dead code