Surpressed clangs tautological comparison warnings when safe
Removed unused private field