Drop other dependencies back to 2.1.0