moved unnecessary stuff to common-lang