Issue #139: deleted unnecessary code