rwh cleanup