Remove commons-lang dependency