Remove obsolete export.
Style
Improve profile patching.