cleanup
cleanup
smoketest updated