Removed dependencies on commons-lang