some deletitions/modifications