Cleanup of single conversion