[refactor] removed an unnecessary scenario and refactored a wipped scenario