Cut cruft, eliminated warnings