Remove unnessesery code