Refactor to remove Dummy