Issue #57 : remove legacy code, comment out log for debugging