Clean up some dependency fuckery