simulator: cleanup