remove unnecessary function and fix tests that relied on it
refactor first pass extend interface