Revert refactor/interfaces