remove remaining calls to mswallow