Cleanup and fix bomb.