removing not neccesery code