Added delete and some return values #6444