Issue #109 - deleting unused methods