Clean up throw
Clean up counter