Issue #17 : remove legacy code