continue refactor and deprecation notice