Code Review: Drop unneeded bits.