new abrivitions and remove useles code