Remove stack trace tweaks v5