Remove external dependancy on commons-lang3