WIP: removing unused dependency