Cleaned dependencies a bit