Removing dead code, extraneous comments and other useless bits.