Remove some dead code and pointless comments