Still trying to fix body removal bug