Update dependencies

 Make all top-level roles to depends on common
 Remove duplicates/redundant dependencies