WIP: Cleanup of NFE