Remove dependency on apache commons-lang