removing some unused bits.