Finised removing unused dependancies