Issue #164 - removing unused code