add language module, remove obsolute code