refactor(interfaces) Remove unneeded interfaces