Removed unused field.
Removed/suppressed false warnings. Fixes #936