issue #16 - Deleted dead code