Fixed multiple delete (probably). Some cleaning