removed deffunctins