Removing usages of commons-lang (implicit dependency)