Improve onDelete, Fix unecessary request on joints