Slimming down dependencies - step 2