rework to be only work with given imput
remove unused dep
update fixture
firm up dependencies