Fix delete + improve random selection + clean up