fixing a delete issue
Optimized 35 so it's pretty fast