clean up unnecessary code for Issue #888