Remove dep to commons-lang, implement own wrap