Clean up some dependancies