Make debug step less personal. Remove defunct smoke test.