Steve:  clean up