Fixed: Compiler warnings

Unused variables and tautological conditions.