Trimmed a little dead code