Remaining dependencies on commons lang removed