Issue #20 - Remove unused fields
Issue #20 - Remove unused fields
Issue #20 - Reduce cyclomatic complexity