More work on cleaning up dependencies