Cleanup and optional metrics