refactor - remove lagacy