Issue #276 - remove unused code