Remove extra interface, extract helper package.