Try to clean up dependencies a bit.