stripped out bits that weren't needed