Update dependancies
Remove duplicate code