wip cleaning up of dependencies.