Drop scope param from exit methods, per review