Cleaning up dependencies

https://www.pivotaltracker.com/story/show/79483784