Remove org dependency