FW-211. Cleanup.