REFACTOR: remove  code that is no longer needed