decoy timeout and remove entity fix