Removing commons-lang dependency