Auto delete/cleanup class added