Reformed proper solution
Fixed missing delete adds