Steve:  cleanup