clean up statements too