Implement Better Cleanup on Stop.