Changed to inactivating bodies instead of removing them